_debuffs;
@@ -68,36 +67,35 @@ public class MagicEffectIcons implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MAGIC_EFFECT_ICONS.writeId(packet);
- packet.writeH(_effects.size() + _debuffs.size());
+ ServerPackets.MAGIC_EFFECT_ICONS.writeId(this);
+ writeShort(_effects.size() + _debuffs.size());
for (Effect temp : _effects)
{
- packet.writeD(temp._skillId);
- packet.writeH(temp._level);
+ writeInt(temp._skillId);
+ writeShort(temp._level);
if (temp._duration == -1)
{
- packet.writeD(-1);
+ writeInt(-1);
}
else
{
- packet.writeD(temp._duration / 1000);
+ writeInt(temp._duration / 1000);
}
}
for (Effect temp : _debuffs)
{
- packet.writeD(temp._skillId);
- packet.writeH(temp._level);
+ writeInt(temp._skillId);
+ writeShort(temp._level);
if (temp._duration == -1)
{
- packet.writeD(-1);
+ writeInt(-1);
}
else
{
- packet.writeD(temp._duration / 1000);
+ writeInt(temp._duration / 1000);
}
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java
index 388adb927a..a5db8c273d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.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;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class MagicSkillCanceld implements IClientOutgoingPacket
+public class MagicSkillCanceld extends ServerPacket
{
private final int _objectId;
@@ -32,10 +31,9 @@ public class MagicSkillCanceld implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MAGIC_SKILL_CANCELD.writeId(packet);
- packet.writeD(_objectId);
- return true;
+ ServerPackets.MAGIC_SKILL_CANCELD.writeId(this);
+ writeInt(_objectId);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 3773099a5b..df55db06e4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.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.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* sample 0000: 8e d8 a8 10 48 10 04 00 00 01 00 00 00 01 00 00 ....H........... 0010: 00 d8 a8 10 48 ....H format ddddd d
* @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class MagicSkillLaunched implements IClientOutgoingPacket
+public class MagicSkillLaunched extends ServerPacket
{
private final int _objectId;
private final int _skillId;
@@ -66,16 +65,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(_numberOfTargets); // also failed or not?
+ ServerPackets.MAGIC_SKILL_LAUNCHED.writeId(this);
+ writeInt(_objectId);
+ writeInt(_skillId);
+ writeInt(_skillLevel);
+ writeInt(_numberOfTargets); // also failed or not?
if ((_singleTargetId != 0) || (_numberOfTargets == 0))
{
- packet.writeD(_singleTargetId);
+ writeInt(_singleTargetId);
}
else
{
@@ -83,14 +82,13 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
{
try
{
- packet.writeD(target.getObjectId());
+ writeInt(target.getObjectId());
}
catch (NullPointerException e)
{
- packet.writeD(0); // untested
+ writeInt(0); // untested
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
index 04a8281b65..e18cc68fe0 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.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 MagicSkillUse implements IClientOutgoingPacket
+public class MagicSkillUse extends ServerPacket
{
private final int _objectId;
private final int _x;
@@ -37,6 +36,8 @@ public class MagicSkillUse implements IClientOutgoingPacket
public MagicSkillUse(Creature creature, Creature target, int skillId, int skillLevel, int hitTime, int reuseDelay)
{
+ super(64);
+
_objectId = creature.getObjectId();
_x = creature.getX();
_y = creature.getY();
@@ -62,18 +63,18 @@ public class MagicSkillUse implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.MAGIC_SKILL_USE.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_targetId);
- packet.writeD(_skillId);
- packet.writeD(_skillLevel);
- packet.writeD(_hitTime);
- packet.writeD(_reuseDelay);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
+ ServerPackets.MAGIC_SKILL_USE.writeId(this);
+ writeInt(_objectId);
+ writeInt(_targetId);
+ writeInt(_skillId);
+ writeInt(_skillLevel);
+ writeInt(_hitTime);
+ writeInt(_reuseDelay);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
// if (_critical) // ?
// {
// writeD(1);
@@ -81,11 +82,10 @@ public class MagicSkillUse implements IClientOutgoingPacket
// }
// else
// {
- packet.writeD(0);
+ writeInt(0);
// }
- packet.writeD(_targetx);
- packet.writeD(_targety);
- packet.writeD(_targetz);
- return true;
+ writeInt(_targetx);
+ writeInt(_targety);
+ writeInt(_targetz);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
index e6e8dd12c4..50db61b496 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
+++ b/L2J_Mobius_C6_Interlude/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,7 +33,7 @@ public class ManagePledgePower implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
int privs = 0;
if (_action == 1)
@@ -43,12 +42,12 @@ public class ManagePledgePower implements IClientOutgoingPacket
}
else
{
- return true;
+ return;
}
- OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(privs);
- return true;
+
+ ServerPackets.MANAGE_PLEDGE_POWER.writeId(this);
+ writeInt(0);
+ writeInt(0);
+ writeInt(privs);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
index cdb12d1b27..fa55f53a8e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.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.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* sample 06 8f19904b 2522d04b 00000000 80 950c0000 4af50000 08f2ffff 0000 - 0 damage (missed 0x80) 06 85071048 bc0e504b 32000000 10 fc41ffff fd240200 a6f5ffff 0100 bc0e504b 33000000 10 3.... format dddc dddh (ddc)
* @version $Revision: 1.1.6.2 $ $Date: 2005/03/27 15:29:39 $
*/
-public class MonRaceInfo implements IClientOutgoingPacket
+public class MonRaceInfo extends ServerPacket
{
private final int _unknown1;
private final int _unknown2;
@@ -43,38 +42,37 @@ 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().getCollisionHeight()); // coll. height
- packet.writeF(_monsters[i].getTemplate().getCollisionRadius()); // 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().getCollisionHeight()); // coll. height
+ writeDouble(_monsters[i].getTemplate().getCollisionRadius()); // 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);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
index 1b4775ea64..c5fe568746 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.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;
/**
* 0000: 01 7a 73 10 4c b2 0b 00 00 a3 fc 00 00 e8 f1 ff .zs.L........... 0010: ff bd 0b 00 00 b3 fc 00 00 e8 f1 ff ff ............. ddddddd
* @version $Revision: 1.3.4.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class MoveToLocation implements IClientOutgoingPacket
+public class MoveToLocation extends ServerPacket
{
private final int _objectId;
private final int _x;
@@ -46,16 +45,15 @@ public class MoveToLocation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.CHAR_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.CHAR_MOVE_TO_LOCATION.writeId(this);
+ writeInt(_objectId);
+ writeInt(_xDst);
+ writeInt(_yDst);
+ writeInt(_zDst);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
index 04f10aa847..1d6d39adb3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
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 int _objectId;
private int _boatId;
@@ -50,17 +49,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
index 9dd7fd3304..7e03555915 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* 0000: 75 7a 07 80 49 63 27 00 4a ea 01 00 00 c1 37 fe uz..Ic'.J.....7.
@@ -30,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*
* @version $Revision: 1.3.2.1.2.5 $ $Date: 2005/04/06 16:13:46 $
*/
-public class MoveToPawn implements IClientOutgoingPacket
+public class MoveToPawn extends ServerPacket
{
private final int _objectId;
private final int _targetId;
@@ -50,15 +49,14 @@ 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);
- return true;
+ ServerPackets.MOVE_TO_PAWN.writeId(this);
+ writeInt(_objectId);
+ writeInt(_targetId);
+ writeInt(_distance);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
index 52f436d8a1..c6ef70aa60 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
@@ -16,17 +16,16 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.model.multisell.MultiSellEntry;
import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient;
import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @version $Revision: 1.2 $ $Date: 2004/06/27 08:12:59 $
*/
-public class MultiSellList implements IClientOutgoingPacket
+public class MultiSellList extends ServerPacket
{
protected int _listId;
protected int _page;
@@ -42,34 +41,34 @@ public class MultiSellList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
// [ddddd] [dchh] [hdhdh] [hhdh]
- OutgoingPackets.MULTI_SELL_LIST.writeId(packet);
- packet.writeD(_listId); // list id
- packet.writeD(_page); // page
- packet.writeD(_finished); // finished
- packet.writeD(0x28); // size of pages
- packet.writeD(_list == null ? 0 : _list.getEntries().size()); // list length
+ ServerPackets.MULTI_SELL_LIST.writeId(this);
+ writeInt(_listId); // list id
+ writeInt(_page); // page
+ writeInt(_finished); // finished
+ writeInt(0x28); // size of pages
+ writeInt(_list == null ? 0 : _list.getEntries().size()); // list length
if (_list != null)
{
for (MultiSellEntry ent : _list.getEntries())
{
- packet.writeD(ent.getEntryId());
- packet.writeD(0); // C6
- packet.writeD(0); // C6
- packet.writeC(1);
- packet.writeH(ent.getProducts().size());
- packet.writeH(ent.getIngredients().size());
+ writeInt(ent.getEntryId());
+ writeInt(0); // C6
+ writeInt(0); // C6
+ writeByte(1);
+ writeShort(ent.getProducts().size());
+ writeShort(ent.getIngredients().size());
for (MultiSellIngredient i : ent.getProducts())
{
- packet.writeH(i.getItemId());
- packet.writeD(ItemTable.getInstance().getTemplate(i.getItemId()).getBodyPart());
- packet.writeH(ItemTable.getInstance().getTemplate(i.getItemId()).getType2());
- packet.writeD(i.getItemCount());
- packet.writeH(i.getEnchantmentLevel()); // enchtant level
- packet.writeD(0); // C6
- packet.writeD(0); // C6
+ writeShort(i.getItemId());
+ writeInt(ItemTable.getInstance().getTemplate(i.getItemId()).getBodyPart());
+ writeShort(ItemTable.getInstance().getTemplate(i.getItemId()).getType2());
+ writeInt(i.getItemCount());
+ writeShort(i.getEnchantmentLevel()); // enchtant level
+ writeInt(0); // C6
+ writeInt(0); // C6
}
for (MultiSellIngredient i : ent.getIngredients())
{
@@ -79,15 +78,14 @@ public class MultiSellList implements IClientOutgoingPacket
{
typeE = ItemTable.getInstance().getTemplate(i.getItemId()).getType2();
}
- packet.writeH(items); // ID
- packet.writeH(typeE);
- packet.writeD(i.getItemCount()); // Count
- packet.writeH(i.getEnchantmentLevel()); // Enchant Level
- packet.writeD(0); // C6
- packet.writeD(0); // C6
+ writeShort(items); // ID
+ writeShort(typeE);
+ writeInt(i.getItemCount()); // Count
+ writeShort(i.getEnchantmentLevel()); // Enchant Level
+ writeInt(0); // C6
+ writeInt(0); // C6
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
index 5bf1eb43f7..33fa853adc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.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;
/**
*
@@ -43,7 +42,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
* usually the color equals the level difference to the selected target.
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class MyTargetSelected implements IClientOutgoingPacket
+public class MyTargetSelected extends ServerPacket
{
/** The _object id. */
private final int _objectId;
@@ -62,11 +61,10 @@ 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);
- return true;
+ ServerPackets.MY_TARGET_SELECTED.writeId(this);
+ writeInt(_objectId);
+ writeShort(_color);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
index f8b6cd883a..a9fc50e87c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NormalCamera.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 NormalCamera implements IClientOutgoingPacket
+public class NormalCamera extends ServerPacket
{
@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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
index cc15fa1a44..9a7da8a724 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
@@ -17,11 +17,10 @@
package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.cache.HtmCache;
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;
import org.l2jmobius.gameserver.util.BuilderUtil;
/**
@@ -125,7 +124,7 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
* .
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class NpcHtmlMessage implements IClientOutgoingPacket
+public class NpcHtmlMessage extends ServerPacket
{
/** The _npc obj id. */
private final int _npcObjId;
@@ -143,6 +142,8 @@ public class NpcHtmlMessage implements IClientOutgoingPacket
*/
public NpcHtmlMessage(int npcObjId, String text)
{
+ super(1024);
+
_npcObjId = npcObjId;
setHtml(text);
}
@@ -153,11 +154,13 @@ public class NpcHtmlMessage implements IClientOutgoingPacket
*/
public NpcHtmlMessage(int npcObjId)
{
+ super(1024);
+
_npcObjId = npcObjId;
}
@Override
- public void runImpl(Player player)
+ public void run(Player player)
{
if (Config.BYPASS_VALIDATION && _validate)
{
@@ -301,13 +304,12 @@ public class NpcHtmlMessage implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet);
- packet.writeD(_npcObjId);
- packet.writeS(_html);
- packet.writeD(0);
- return true;
+ ServerPackets.NPC_HTML_MESSAGE.writeId(this);
+ writeInt(_npcObjId);
+ writeString(_html);
+ writeInt(0);
}
/**
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index e85e955c83..8a83993e83 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.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.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -32,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard;
import org.l2jmobius.gameserver.model.actor.instance.SiegeNpc;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @version $Revision: 1.7.2.4.2.9 $ $Date: 2005/04/11 10:05:54 $
*/
-public class NpcInfo implements IClientOutgoingPacket
+public class NpcInfo extends ServerPacket
{
private Creature _creature;
private int _x;
@@ -190,76 +189,76 @@ public class NpcInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if ((_creature == null) || ((_creature instanceof Summon) && (((Summon) _creature).getOwner() != null) && ((Summon) _creature).getOwner().getAppearance().isInvisible()))
{
- return false;
+ return;
}
- OutgoingPackets.NPC_INFO.writeId(packet);
- packet.writeD(_creature.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/* 0x32 */); // swimspeed
- packet.writeD(_swimWalkSpd/* 0x32 */); // swimspeed
- packet.writeD(_flRunSpd);
- packet.writeD(_flWalkSpd);
- packet.writeD(_flyRunSpd);
- packet.writeD(_flyWalkSpd);
- packet.writeF(1.1/* _activeChar.getProperMultiplier() */);
+
+ ServerPackets.NPC_INFO.writeId(this);
+ writeInt(_creature.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/* 0x32 */); // swimspeed
+ writeInt(_swimWalkSpd/* 0x32 */); // swimspeed
+ writeInt(_flRunSpd);
+ writeInt(_flWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(1.1/* _activeChar.getProperMultiplier() */);
// writeF(1/*_activeChar.getAttackSpeedMultiplier()*/);
- packet.writeF(_pAtkSpd / 277.478340719);
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD(_rhand); // right hand weapon
- packet.writeD(0);
- packet.writeD(_lhand); // left hand weapon
- packet.writeC(1); // name above char 1=true ... ??
- packet.writeC(_creature.isRunning() ? 1 : 0);
- packet.writeC(_creature.isInCombat() ? 1 : 0);
- packet.writeC(_creature.isAlikeDead() ? 1 : 0);
- packet.writeC(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
- packet.writeS(_name);
- packet.writeS(_title);
+ writeDouble(_pAtkSpd / 277.478340719);
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt(_rhand); // right hand weapon
+ writeInt(0);
+ writeInt(_lhand); // left hand weapon
+ writeByte(1); // name above char 1=true ... ??
+ writeByte(_creature.isRunning());
+ writeByte(_creature.isInCombat());
+ writeByte(_creature.isAlikeDead());
+ writeByte(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+ writeString(_name);
+ writeString(_title);
if (_creature instanceof Summon)
{
- packet.writeD(1); // Title color 0=client default
- packet.writeD(((Summon) _creature).getPvpFlag());
- packet.writeD(((Summon) _creature).getKarma());
+ writeInt(1); // Title color 0=client default
+ writeInt(((Summon) _creature).getPvpFlag());
+ writeInt(((Summon) _creature).getKarma());
}
else
{
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
- packet.writeD(_creature.getAbnormalEffect()); // C2
- packet.writeD(_clanId); // C2
- packet.writeD(_clanCrest); // C2
- packet.writeD(_allyId); // C2
- packet.writeD(_allyCrest); // C2
- packet.writeC(0); // C2
+ writeInt(_creature.getAbnormalEffect()); // C2
+ writeInt(_clanId); // C2
+ writeInt(_clanCrest); // C2
+ writeInt(_allyId); // C2
+ writeInt(_allyCrest); // C2
+ writeByte(0); // C2
if (Config.CHAMPION_ENABLE)
{
- packet.writeC(_creature.isChampion() ? Config.CHAMPION_AURA : 0);
+ writeByte(_creature.isChampion() ? Config.CHAMPION_AURA : 0);
}
else
{
- packet.writeC(0); // C3 team circle 1-blue, 2-red
+ writeByte(0); // C3 team circle 1-blue, 2-red
}
- packet.writeF(_collisionRadius);
- packet.writeF(_collisionHeight);
- packet.writeD(0); // C4
- packet.writeD(0); // C6
- return true;
+ writeDouble(_collisionRadius);
+ writeDouble(_collisionHeight);
+ writeInt(0); // C4
+ writeInt(0); // C6
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
index 58fce38644..dd87331cd8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.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;
/**
* @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class ObservationMode implements IClientOutgoingPacket
+public class ObservationMode extends ServerPacket
{
private final int _x;
private final int _y;
@@ -41,15 +40,14 @@ public class ObservationMode implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.OBSERVATION_MODE.writeId(packet);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeC(0);
- packet.writeC(0xc0);
- packet.writeC(0);
- return true;
+ ServerPackets.OBSERVATION_MODE.writeId(this);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeByte(0);
+ writeByte(0xc0);
+ writeByte(0);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
index 29c146c746..3b8b0c7365 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.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;
/**
* @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class ObservationReturn implements IClientOutgoingPacket
+public class ObservationReturn extends ServerPacket
{
private final Player _player;
@@ -36,12 +35,11 @@ public class ObservationReturn implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.OBSERVATION_RETURN.writeId(packet);
- packet.writeD(_player.getObsX());
- packet.writeD(_player.getObsY());
- packet.writeD(_player.getObsZ());
- return true;
+ ServerPackets.OBSERVATION_RETURN.writeId(this);
+ writeInt(_player.getObsX());
+ writeInt(_player.getObsY());
+ writeInt(_player.getObsZ());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/OnVehicleCheckLocation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/OnVehicleCheckLocation.java
index b8c2dd8f54..48993c40df 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/OnVehicleCheckLocation.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/OnVehicleCheckLocation.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 OnVehicleCheckLocation implements IClientOutgoingPacket
+public class OnVehicleCheckLocation extends ServerPacket
{
private final Boat _boat;
private final int _x;
@@ -45,14 +44,13 @@ public class OnVehicleCheckLocation implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ON_VEHICLE_CHECK_LOCATION.writeId(packet);
- packet.writeD(_boat.getObjectId());
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_boat.getHeading());
- return true;
+ ServerPackets.ON_VEHICLE_CHECK_LOCATION.writeId(this);
+ writeInt(_boat.getObjectId());
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_boat.getHeading());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
index 8e2ef2aa9c..2f234e6d47 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.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.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PackageSendableList implements IClientOutgoingPacket
+public class PackageSendableList extends ServerPacket
{
private final List- _items;
private final int _playerObjId;
@@ -39,26 +38,25 @@ public class PackageSendableList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet);
- packet.writeD(_playerObjId);
- packet.writeD(_adena);
- packet.writeD(_items.size());
+ ServerPackets.PACKAGE_SENDABLE_LIST.writeId(this);
+ writeInt(_playerObjId);
+ writeInt(_adena);
+ writeInt(_items.size());
for (Item item : _items) // format inside the for taken from SellList part use should be about the same
{
- packet.writeH(item.getTemplate().getType1());
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItemId());
- packet.writeD(item.getCount());
- packet.writeH(item.getTemplate().getType2());
- packet.writeH(0);
- packet.writeD(item.getTemplate().getBodyPart());
- packet.writeH(item.getEnchantLevel());
- packet.writeH(0);
- packet.writeH(0);
- packet.writeD(item.getObjectId()); // some item identifier later used by client to answer (see RequestPackageSend) not item id nor object id maybe some freight system id??
+ writeShort(item.getTemplate().getType1());
+ writeInt(item.getObjectId());
+ writeInt(item.getItemId());
+ writeInt(item.getCount());
+ writeShort(item.getTemplate().getType2());
+ writeShort(0);
+ writeInt(item.getTemplate().getBodyPart());
+ writeShort(item.getEnchantLevel());
+ writeShort(0);
+ writeShort(0);
+ writeInt(item.getObjectId()); // some item identifier later used by client to answer (see RequestPackageSend) not item id nor object id maybe some freight system id??
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java
index 1deb2cd4aa..1e33ce9398 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java
+++ b/L2J_Mobius_C6_Interlude/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;
/**
* Format: (c) d[dS] d: list size [ d: char ID S: char Name ]
* @author -Wooden-
*/
-public class PackageToList implements IClientOutgoingPacket
+public class PackageToList extends ServerPacket
{
private final Map
_players;
@@ -37,15 +36,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()); // you told me char id, i guess this was object id?
- packet.writeS(entry.getValue());
+ writeInt(entry.getKey()); // you told me char id, i guess this was object id?
+ writeString(entry.getValue());
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java
index 117fd58d3d..1b43575fa5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchDetail.java
@@ -16,36 +16,31 @@
*/
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;
- /**
- * @param room
- */
public PartyMatchDetail(PartyMatchRoom room)
{
_room = room;
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_MATCH_DETAIL.writeId(packet);
- packet.writeD(_room.getId()); // Room ID
- packet.writeD(_room.getMaxMembers()); // Max Members
- packet.writeD(_room.getMinLevel()); // Level Min
- packet.writeD(_room.getMaxLevel()); // Level Max
- packet.writeD(_room.getLootType()); // Loot Type
- packet.writeD(_room.getLocation()); // Room Location
- packet.writeS(_room.getTitle()); // Room title
- return true;
+ ServerPackets.PARTY_MATCH_DETAIL.writeId(this);
+ writeInt(_room.getId()); // Room ID
+ writeInt(_room.getMaxMembers()); // Max Members
+ writeInt(_room.getMinLevel()); // Level Min
+ writeInt(_room.getMaxLevel()); // Level Max
+ writeInt(_room.getLootType()); // Loot Type
+ writeInt(_room.getLocation()); // Room Location
+ writeString(_room.getTitle()); // Room title
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java
index e84e975d99..d8a381a97a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.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.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;
-public class PartyMatchList implements IClientOutgoingPacket
+public class PartyMatchList extends ServerPacket
{
private final Player _player;
private final int _loc;
@@ -41,7 +40,7 @@ public class PartyMatchList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
for (PartyMatchRoom room : PartyMatchRoomList.getInstance().getRooms())
{
@@ -62,28 +61,28 @@ public class PartyMatchList implements IClientOutgoingPacket
}
int count = 0;
final int size = _rooms.size();
- OutgoingPackets.PARTY_MATCH_LIST.writeId(packet);
+
+ ServerPackets.PARTY_MATCH_LIST.writeId(this);
if (size > 0)
{
- packet.writeD(1);
+ writeInt(1);
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- packet.writeD(_rooms.size());
+ writeInt(_rooms.size());
while (size > count)
{
- packet.writeD(_rooms.get(count).getId());
- packet.writeS(_rooms.get(count).getTitle());
- packet.writeD(_rooms.get(count).getLocation());
- packet.writeD(_rooms.get(count).getMinLevel());
- packet.writeD(_rooms.get(count).getMaxLevel());
- packet.writeD(_rooms.get(count).getMembers());
- packet.writeD(_rooms.get(count).getMaxMembers());
- packet.writeS(_rooms.get(count).getOwner().getName());
+ writeInt(_rooms.get(count).getId());
+ writeString(_rooms.get(count).getTitle());
+ writeInt(_rooms.get(count).getLocation());
+ writeInt(_rooms.get(count).getMinLevel());
+ writeInt(_rooms.get(count).getMaxLevel());
+ writeInt(_rooms.get(count).getMembers());
+ writeInt(_rooms.get(count).getMaxMembers());
+ writeString(_rooms.get(count).getOwner().getName());
count++;
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
index 300cfa12d4..e52181e672 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
+++ b/L2J_Mobius_C6_Interlude/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
{
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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
index f112f59d41..56b8834fa9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.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;
/**
* @version $Revision: 1.4.2.1.2.5 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PartySmallWindowAdd implements IClientOutgoingPacket
+public class PartySmallWindowAdd extends ServerPacket
{
private final Player _member;
private final int _leaderId;
@@ -38,23 +37,22 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet);
- packet.writeD(_leaderId); // c3
- packet.writeD(_distribution); // 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); // writeD(1); ??
- packet.writeD(0);
- return true;
+ ServerPackets.PARTY_SMALL_WINDOW_ADD.writeId(this);
+ writeInt(_leaderId); // c3
+ writeInt(_distribution); // 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); // writeD(1); ??
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
index 98ee6b2e0b..2c1a105f2f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
@@ -16,16 +16,15 @@
*/
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;
/**
* sample 63 01 00 00 00 count c1 b2 e0 4a object id 54 00 75 00 65 00 73 00 64 00 61 00 79 00 00 00 name 5a 01 00 00 hp 5a 01 00 00 hp max 89 00 00 00 mp 89 00 00 00 mp max 0e 00 00 00 level 12 00 00 00 class 00 00 00 00 01 00 00 00 format d (dSdddddddd)
* @version $Revision: 1.6.2.1.2.5 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PartySmallWindowAll implements IClientOutgoingPacket
+public class PartySmallWindowAll extends ServerPacket
{
private final Party _party;
private final Player _exclude;
@@ -41,30 +40,29 @@ public class PartySmallWindowAll implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet);
- packet.writeD(_leaderObjId);
- packet.writeD(_dist);
- packet.writeD(_party.getMemberCount() - 1);
+ ServerPackets.PARTY_SMALL_WINDOW_ALL.writeId(this);
+ writeInt(_leaderObjId);
+ writeInt(_dist);
+ writeInt(_party.getMemberCount() - 1);
for (Player member : _party.getPartyMembers())
{
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); // writeD(1); ??
- packet.writeD(member.getRace().ordinal());
+ 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); // writeD(1); ??
+ writeInt(member.getRace().ordinal());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
index 7b7d36083b..39ba3b2fc2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.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;
/**
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PartySmallWindowDelete implements IClientOutgoingPacket
+public class PartySmallWindowDelete extends ServerPacket
{
private final Player _member;
@@ -33,11 +32,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
index b141cf1b61..07bb1056cb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.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;
/**
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PartySmallWindowDeleteAll implements IClientOutgoingPacket
+public class PartySmallWindowDeleteAll extends ServerPacket
{
@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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
index 496e0bb812..91c915adcf 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.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;
/**
* @version $Revision: 1.4.2.1.2.5 $ $Date: 2005/03/27 15:29:39 $
*/
-public class PartySmallWindowUpdate implements IClientOutgoingPacket
+public class PartySmallWindowUpdate extends ServerPacket
{
private final Player _member;
@@ -33,19 +32,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java
index a82f3eba7b..c2e44f46fc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.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.Creature;
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.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class PartySpelled implements IClientOutgoingPacket
+public class PartySpelled extends ServerPacket
{
private final List _effects;
private final Creature _creature;
@@ -54,23 +53,23 @@ public class PartySpelled implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
if (_creature == null)
{
- return false;
+ return;
}
- OutgoingPackets.PARTY_SPELLED.writeId(packet);
- packet.writeD(_creature instanceof Servitor ? 2 : _creature instanceof Pet ? 1 : 0);
- packet.writeD(_creature.getObjectId());
- packet.writeD(_effects.size());
+
+ ServerPackets.PARTY_SPELLED.writeId(this);
+ writeInt(_creature instanceof Servitor ? 2 : _creature instanceof Pet ? 1 : 0);
+ writeInt(_creature.getObjectId());
+ writeInt(_effects.size());
for (Effect temp : _effects)
{
- packet.writeD(temp._skillId);
- packet.writeH(temp._dat);
- packet.writeD(temp._duration / 1000);
+ writeInt(temp._skillId);
+ writeShort(temp._dat);
+ writeInt(temp._duration / 1000);
}
- return true;
}
public void addPartySpelledEffect(int skillId, int dat, int duration)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java
index 467831c73d..4767620901 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetDelete.java
+++ b/L2J_Mobius_C6_Interlude/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 _petId;
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(_petId); // dont really know what these two are since i never needed them
- packet.writeD(_petObjId); // objectId
- return true;
+ ServerPackets.PET_DELETE.writeId(this);
+ writeInt(_petId); // dont really know what these two are since i never needed them
+ writeInt(_petObjId); // objectId
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
index fdef587acc..4f2524628d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.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.6.2.5.2.12 $ $Date: 2005/03/31 09:19:16 $
*/
-public class PetInfo implements IClientOutgoingPacket
+public class PetInfo extends ServerPacket
{
private final Summon _summon;
private final int _x;
@@ -83,84 +82,83 @@ 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(_flRunSpd);
- packet.writeD(_flWalkSpd);
- packet.writeD(_flyRunSpd);
- packet.writeD(_flyWalkSpd);
- packet.writeF(1/* _cha.getProperMultiplier() */);
- packet.writeF(1/* _cha.getAttackSpeedMultiplier() */);
- packet.writeF(_summon.getTemplate().getFCollisionRadius());
- packet.writeF(_summon.getTemplate().getFCollisionHeight());
- packet.writeD(0); // right hand weapon
- packet.writeD(0);
- packet.writeD(0); // left hand weapon
- packet.writeC(1); // name above char 1=true ... ??
- packet.writeC(_summon.isRunning() ? 1 : 0); // running=1
- packet.writeC(_summon.isInCombat() ? 1 : 0); // attacking 1=true
- packet.writeC(_summon.isAlikeDead() ? 1 : 0); // dead 1=true
- packet.writeC(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
- packet.writeS(_summon.getName());
- packet.writeS(_summon.getTitle());
- packet.writeD(1);
- packet.writeD(_summon.getOwner() != null ? _summon.getOwner().getPvpFlag() : 0); // 0 = white,2= purpleblink, if its greater then karma = purple
- packet.writeD(_summon.getOwner() != null ? _summon.getOwner().getKarma() : 0); // 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(_summon.getStat().getSp()); // sp
- packet.writeD(_summon.getLevel()); // level
- packet.writeQ(_summon.getStat().getExp());
- packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value
- packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value
- packet.writeD(_summon instanceof Pet ? _summon.getInventory().getTotalWeight() : 0); // weight
- packet.writeD(_summon.getMaxLoad()); // max weight it can carry
- packet.writeD(_summon.getPAtk(null)); // patk
- packet.writeD(_summon.getPDef(null)); // pdef
- packet.writeD(_summon.getMAtk(null, null)); // matk
- packet.writeD(_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(_runSpd); // speed
- packet.writeD(_summon.getPAtkSpd()); // atkspeed
- packet.writeD(_summon.getMAtkSpd()); // casting speed
- packet.writeD(0); // c2 abnormal visual effect... bleed=1; poison=2; poison & bleed=3; flame=4;
+ 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(_flRunSpd);
+ writeInt(_flWalkSpd);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(1/* _cha.getProperMultiplier() */);
+ writeDouble(1/* _cha.getAttackSpeedMultiplier() */);
+ writeDouble(_summon.getTemplate().getFCollisionRadius());
+ writeDouble(_summon.getTemplate().getFCollisionHeight());
+ writeInt(0); // right hand weapon
+ writeInt(0);
+ writeInt(0); // left hand weapon
+ writeByte(1); // name above char 1=true ... ??
+ writeByte(_summon.isRunning()); // running=1
+ writeByte(_summon.isInCombat()); // attacking 1=true
+ writeByte(_summon.isAlikeDead()); // dead 1=true
+ writeByte(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+ writeString(_summon.getName());
+ writeString(_summon.getTitle());
+ writeInt(1);
+ writeInt(_summon.getOwner() != null ? _summon.getOwner().getPvpFlag() : 0); // 0 = white,2= purpleblink, if its greater then karma = purple
+ writeInt(_summon.getOwner() != null ? _summon.getOwner().getKarma() : 0); // 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(_summon.getStat().getSp()); // sp
+ writeInt(_summon.getLevel()); // level
+ writeLong(_summon.getStat().getExp());
+ writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+ writeLong(_summon.getExpForNextLevel()); // 100% absoulte value
+ writeInt(_summon instanceof Pet ? _summon.getInventory().getTotalWeight() : 0); // weight
+ writeInt(_summon.getMaxLoad()); // max weight it can carry
+ writeInt(_summon.getPAtk(null)); // patk
+ writeInt(_summon.getPDef(null)); // pdef
+ writeInt(_summon.getMAtk(null, null)); // matk
+ writeInt(_summon.getMDef(null, null)); // mdef
+ writeInt(_summon.getAccuracy()); // accuracy
+ writeInt(_summon.getEvasionRate(null)); // evasion
+ writeInt(_summon.getCriticalHit(null, null)); // critical
+ writeInt(_runSpd); // speed
+ writeInt(_summon.getPAtkSpd()); // atkspeed
+ writeInt(_summon.getMAtkSpd()); // casting speed
+ writeInt(0); // c2 abnormal visual effect... bleed=1; poison=2; poison & bleed=3; flame=4;
final int npcId = _summon.getTemplate().getNpcId();
if ((npcId >= 12526) && (npcId <= 12528))
{
- packet.writeH(1); // c2 ride button
+ writeShort(1); // c2 ride button
}
else
{
- packet.writeH(0);
+ writeShort(0);
}
- packet.writeC(0); // c2
+ writeByte(0); // c2
// Following all added in C4.
- packet.writeH(0); // ??
- packet.writeC(0); // team aura (1 = blue, 2 = red)
- packet.writeD(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit
- packet.writeD(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit
- return true;
+ writeShort(0); // ??
+ writeByte(0); // team aura (1 = blue, 2 = red)
+ writeInt(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit
+ writeInt(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java
index fc3e207d90..3bc0a9044d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.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.ItemInfo;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author Yme
* @version $Revision: 1.3.2.1.2.5 $ $Date: 2005/03/27 15:29:57 $ Rebuild 23.2.2006 by Advi
*/
-public class PetInventoryUpdate implements IClientOutgoingPacket
+public class PetInventoryUpdate extends ServerPacket
{
private final List _items;
@@ -74,26 +73,25 @@ public class PetInventoryUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet);
+ ServerPackets.PET_INVENTORY_UPDATE.writeId(this);
final int count = _items.size();
- packet.writeH(count);
+ writeShort(count);
for (ItemInfo item : _items)
{
- packet.writeH(item.getChange());
- packet.writeH(item.getItem().getType1()); // item type1
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItem().getItemId());
- packet.writeD(item.getCount());
- packet.writeH(item.getItem().getType2()); // item type2
- packet.writeH(0); // ?
- packet.writeH(item.getEquipped());
- // writeH(temp.getItem().getBodyPart()); // rev 377 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.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); // ?
+ writeShort(item.getChange());
+ writeShort(item.getItem().getType1()); // item type1
+ writeInt(item.getObjectId());
+ writeInt(item.getItem().getItemId());
+ writeInt(item.getCount());
+ writeShort(item.getItem().getType2()); // item type2
+ writeShort(0); // ?
+ writeShort(item.getEquipped());
+ // writeShort(temp.getItem().getBodyPart()); // rev 377 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
+ 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); // ?
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java
index 85fa8e3d79..563319b31c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.Pet;
import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @version $Revision: 1.4.2.1.2.4 $ $Date: 2005/03/27 15:29:39 $
*/
-public class PetItemList implements IClientOutgoingPacket
+public class PetItemList extends ServerPacket
{
private final Collection- _items;
@@ -36,31 +35,30 @@ public class PetItemList implements IClientOutgoingPacket
}
@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 temp : _items)
{
- packet.writeH(temp.getTemplate().getType1()); // item type1
- packet.writeD(temp.getObjectId());
- packet.writeD(temp.getItemId());
- packet.writeD(temp.getCount());
- packet.writeH(temp.getTemplate().getType2()); // item type2
- packet.writeH(0xff); // ?
+ writeShort(temp.getTemplate().getType1()); // item type1
+ writeInt(temp.getObjectId());
+ writeInt(temp.getItemId());
+ writeInt(temp.getCount());
+ writeShort(temp.getTemplate().getType2()); // item type2
+ writeShort(0xff); // ?
if (temp.isEquipped())
{
- packet.writeH(1);
+ writeShort(1);
}
else
{
- packet.writeH(0);
+ writeShort(0);
}
- packet.writeD(temp.getTemplate().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
+ writeInt(temp.getTemplate().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
// writeH(temp.getItem().getBodyPart()); // rev 377 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(temp.getEnchantLevel()); // enchant level
- packet.writeH(0); // ?
+ writeShort(temp.getEnchantLevel()); // enchant level
+ writeShort(0); // ?
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java
index 2e6c5c1535..f980d80b62 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java
@@ -16,15 +16,14 @@
*/
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
* @version $Revision: 1.3.2.2.2.4 $ $Date: 2005/03/29 23:15:10 $
*/
-public class PetStatusShow implements IClientOutgoingPacket
+public class PetStatusShow extends ServerPacket
{
private final int _summonType;
@@ -34,10 +33,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
index cc978fdc42..7f60b1fd4c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
+++ b/L2J_Mobius_C6_Interlude/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 final int _maxHp;
@@ -53,25 +52,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.getOwner().getName());
- packet.writeD(_curFed);
- packet.writeD(_maxFed);
- packet.writeD((int) _summon.getCurrentHp());
- packet.writeD(_maxHp);
- packet.writeD((int) _summon.getCurrentMp());
- packet.writeD(_maxMp);
- 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.getOwner().getName());
+ writeInt(_curFed);
+ writeInt(_maxFed);
+ writeInt((int) _summon.getCurrentHp());
+ writeInt(_maxHp);
+ writeInt((int) _summon.getCurrentMp());
+ writeInt(_maxMp);
+ writeInt(_summon.getLevel());
+ writeLong(_summon.getStat().getExp());
+ writeLong(_summon.getExpForThisLevel()); // 0% absolute value
+ writeLong(_summon.getExpForNextLevel()); // 100% absolute value
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java
index 8d960fb838..72b2300b81 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.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 PlaySound implements IClientOutgoingPacket
+public class PlaySound extends ServerPacket
{
private static final Location DUMMY_LOC = new Location(0, 0, 0);
@@ -97,17 +96,16 @@ public class PlaySound implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLAY_SOUND.writeId(packet);
- packet.writeD(_unknown);
- packet.writeS(_soundFile);
- packet.writeD(_isObject ? 1 : 0);
- packet.writeD(_objectId);
- packet.writeD(_loc.getX());
- packet.writeD(_loc.getY());
- packet.writeD(_loc.getZ());
- packet.writeD(_duration);
- return true;
+ ServerPackets.PLAY_SOUND.writeId(this);
+ writeInt(_unknown);
+ writeString(_soundFile);
+ writeInt(_isObject);
+ writeInt(_objectId);
+ writeInt(_loc.getX());
+ writeInt(_loc.getY());
+ writeInt(_loc.getZ());
+ writeInt(_duration);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
index 5b93dca07b..d66b90a22c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
index 6198fed193..7247b068c6 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
@@ -16,15 +16,14 @@
*/
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;
/**
* sample 0000: 9c c10c0000 48 00 61 00 6d 00 62 00 75 00 72 .....H.a.m.b.u.r 0010: 00 67 00 00 00 00000000 00000000 00000000 00000000 00000000 00000000 00 00 00000000 ... format dSddddddSd
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PledgeInfo implements IClientOutgoingPacket
+public class PledgeInfo extends ServerPacket
{
private final Clan _clan;
@@ -34,12 +33,11 @@ public class PledgeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_INFO.writeId(packet);
- packet.writeD(_clan.getClanId());
- packet.writeS(_clan.getName());
- packet.writeS(_clan.getAllyName());
- return true;
+ ServerPackets.PLEDGE_INFO.writeId(this);
+ writeInt(_clan.getClanId());
+ writeString(_clan.getName());
+ writeString(_clan.getAllyName());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
index 65f0f2798f..2737a3f3fb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* sample 0000: 9c c10c0000 48 00 61 00 6d 00 62 00 75 00 72 .....H.a.m.b.u.r 0010: 00 67 00 00 00 00000000 00000000 00000000 00000000 00000000 00000000 00 00 00000000 ... format dd ??
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PledgePowerGradeList implements IClientOutgoingPacket
+public class PledgePowerGradeList extends ServerPacket
{
private final Collection
_privs;
@@ -36,15 +35,14 @@ public class PledgePowerGradeList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet);
- packet.writeD(_privs.size());
+ ServerPackets.PLEDGE_POWER_GRADE_LIST.writeId(this);
+ writeInt(_privs.size());
for (RankPrivs priv : _privs)
{
- packet.writeD(priv.getRank());
- packet.writeD(priv.getParty());
+ writeInt(priv.getRank());
+ writeInt(priv.getParty());
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
index dfae9013be..807075b178 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.ClanMember;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PledgeReceiveMemberInfo implements IClientOutgoingPacket
+public class PledgeReceiveMemberInfo extends ServerPacket
{
private final ClanMember _member;
@@ -33,23 +32,22 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet);
- packet.writeD(_member.getPledgeType());
- packet.writeS(_member.getName());
- packet.writeS(_member.getTitle()); // title
- packet.writeD(_member.getPowerGrade()); // power
+ ServerPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(this);
+ writeInt(_member.getPledgeType());
+ writeString(_member.getName());
+ writeString(_member.getTitle()); // title
+ writeInt(_member.getPowerGrade()); // power
// clan or subpledge name
if (_member.getPledgeType() != 0)
{
- packet.writeS(_member.getClan().getSubPledge(_member.getPledgeType()).getName());
+ writeString(_member.getClan().getSubPledge(_member.getPledgeType()).getName());
}
else
{
- packet.writeS(_member.getClan().getName());
+ writeString(_member.getClan().getName());
}
- packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor
- return true;
+ writeString(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
index 2d8e6b75e0..006654544c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
@@ -16,15 +16,14 @@
*/
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;
/**
* Format : (ch) dSd
* @author -Wooden-
*/
-public class PledgeReceivePowerInfo implements IClientOutgoingPacket
+public class PledgeReceivePowerInfo extends ServerPacket
{
private final ClanMember _member;
@@ -34,12 +33,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())); // privileges
- return true;
+ ServerPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(this);
+ writeInt(_member.getPowerGrade()); // power grade
+ writeString(_member.getName());
+ writeInt(_member.getClan().getRankPrivs(_member.getPowerGrade())); // privileges
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
index 5817ae347e..317cbeb8f9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan.SubPledge;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @author -Wooden-
*/
-public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket
+public class PledgeReceiveSubPledgeCreated extends ServerPacket
{
private final SubPledge _subPledge;
@@ -33,13 +32,12 @@ 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(_subPledge.getLeaderName());
- return true;
+ ServerPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(this);
+ writeInt(1);
+ writeInt(_subPledge.getId());
+ writeString(_subPledge.getName());
+ writeString(_subPledge.getLeaderName());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
index 67358d749b..502f14d903 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
index 692a89c812..1b49129cf7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.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.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class PledgeShowInfoUpdate implements IClientOutgoingPacket
+public class PledgeShowInfoUpdate extends ServerPacket
{
private final Clan _clan;
@@ -31,24 +30,23 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
// ddddddddddSdd
- 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.getClanId());
- packet.writeD(_clan.getCrestId());
- packet.writeD(_clan.getLevel()); // clan level
- packet.writeD(_clan.getFortId() != 0 ? _clan.getFortId() : _clan.getCastleId());
- packet.writeD(_clan.getHideoutId());
- packet.writeD(ClanTable.getInstance().getTopRate(_clan.getClanId()));
- packet.writeD(_clan.getReputationScore()); // clan reputation score
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(_clan.getAllyId());
- packet.writeS(_clan.getAllyName());
- packet.writeD(_clan.getAllyCrestId());
- packet.writeD(_clan.isAtWar());
- return true;
+ writeInt(_clan.getClanId());
+ writeInt(_clan.getCrestId());
+ writeInt(_clan.getLevel()); // clan level
+ writeInt(_clan.getFortId() != 0 ? _clan.getFortId() : _clan.getCastleId());
+ writeInt(_clan.getHideoutId());
+ writeInt(ClanTable.getInstance().getTopRate(_clan.getClanId()));
+ writeInt(_clan.getReputationScore()); // clan reputation score
+ writeInt(0);
+ writeInt(0);
+ writeInt(_clan.getAllyId());
+ writeString(_clan.getAllyName());
+ writeInt(_clan.getAllyCrestId());
+ writeInt(_clan.isAtWar());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
index baef14f74e..6742ccac37 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
+++ b/L2J_Mobius_C6_Interlude/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 String _name;
private int _level;
@@ -54,16 +53,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);
- 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);
+ writeInt(_pledgeType);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
index 1ecc74d50e..84d8a63472 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.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.data.sql.ClanTable;
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;
@@ -41,10 +40,10 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
_pledgeType = 0;
- writePledge(packet, 0);
+ writePledge(0);
for (SubPledge element : _clan.getAllSubPledges())
{
_player.sendPacket(new PledgeReceiveSubPledgeCreated(element));
@@ -59,31 +58,30 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
}
// unless this is sent sometimes, the client doesn't recognize the player as the leader
_player.sendPacket(new UserInfo(_player));
- return true;
}
- void writePledge(PacketWriter packet, int mainOrSubpledge)
+ void writePledge(int mainOrSubpledge)
{
- OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet);
- packet.writeD(mainOrSubpledge); // c5 main clan 0 or any subpledge 1?
- packet.writeD(_clan.getClanId());
- packet.writeD(_pledgeType); // c5 - possibly pledge type?
- 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(ClanTable.getInstance().getTopRate(_clan.getClanId()));
- packet.writeD(_clan.getReputationScore()); // was activechar level
- packet.writeD(0); // 0
- packet.writeD(0); // 0
- packet.writeD(_clan.getAllyId());
- packet.writeS(_clan.getAllyName());
- packet.writeD(_clan.getAllyCrestId());
- packet.writeD(_clan.isAtWar());
- packet.writeD(_clan.getSubPledgeMembersCount(_pledgeType));
- int yellow;
+ ServerPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(this);
+ writeInt(mainOrSubpledge); // c5 main clan 0 or any subpledge 1?
+ writeInt(_clan.getClanId());
+ writeInt(_pledgeType); // c5 - possibly pledge type?
+ writeString(_clan.getName());
+ writeString(_clan.getLeaderName());
+ writeInt(_clan.getCrestId()); // crest id .. is used again
+ writeInt(_clan.getLevel());
+ writeInt(_clan.getCastleId());
+ writeInt(_clan.getHideoutId());
+ writeInt(ClanTable.getInstance().getTopRate(_clan.getClanId()));
+ writeInt(_clan.getReputationScore()); // was activechar level
+ writeInt(0); // 0
+ writeInt(0); // 0
+ writeInt(_clan.getAllyId());
+ writeString(_clan.getAllyName());
+ writeInt(_clan.getAllyCrestId());
+ writeInt(_clan.isAtWar());
+ writeInt(_clan.getSubPledgeMembersCount(_pledgeType));
+ boolean yellow;
for (ClanMember m : _members)
{
if (m.getPledgeType() != _pledgeType)
@@ -92,23 +90,23 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
}
if (m.getPledgeType() == -1)
{
- yellow = m.getSponsor() != 0 ? 1 : 0;
+ yellow = m.getSponsor() != 0;
}
else if (m.getPlayer() != null)
{
- yellow = m.getPlayer().isClanLeader() ? 1 : 0;
+ yellow = m.getPlayer().isClanLeader();
}
else
{
- yellow = 0;
+ yellow = false;
}
- packet.writeS(m.getName());
- packet.writeD(m.getLevel());
- packet.writeD(m.getClassId());
- packet.writeD(0);
- packet.writeD(1);
- packet.writeD(m.isOnline() || (_player.getObjectId() == m.getObjectId()) ? m.getObjectId() : 0);
- packet.writeD(yellow);
+ writeString(m.getName());
+ writeInt(m.getLevel());
+ writeInt(m.getClassId());
+ writeInt(0);
+ writeInt(1);
+ writeInt(m.isOnline() || (_player.getObjectId() == m.getObjectId()) ? m.getObjectId() : 0);
+ writeInt(yellow);
}
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
index 154bcc610d..11a8076a81 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
index 555df435c2..89c85adb79 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.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 PledgeShowMemberListDeleteAll implements IClientOutgoingPacket
+public class PledgeShowMemberListDeleteAll extends ServerPacket
{
@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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
index eab7782a29..9d50ed76b2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
@@ -16,20 +16,19 @@
*/
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 Player _player;
private final int _pledgeType;
- private int _hasSponsor;
+ private boolean _hasSponsor;
private final String _name;
private final int _level;
private final int _classId;
@@ -41,15 +40,15 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_pledgeType = _player.getPledgeType();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
- _hasSponsor = _player.getSponsor() != 0 ? 1 : 0;
+ _hasSponsor = _player.getSponsor() != 0;
}
else if (_player.isOnline())
{
- _hasSponsor = _player.isClanLeader() ? 1 : 0;
+ _hasSponsor = _player.isClanLeader();
}
else
{
- _hasSponsor = 0;
+ _hasSponsor = false;
}
_name = _player.getName();
_level = _player.getLevel();
@@ -67,30 +66,29 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_pledgeType = member.getPledgeType();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
- _hasSponsor = _player.getSponsor() != 0 ? 1 : 0;
+ _hasSponsor = _player.getSponsor() != 0;
}
else if (member.isOnline())
{
- _hasSponsor = _player.isClanLeader() ? 1 : 0;
+ _hasSponsor = _player.isClanLeader();
}
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(0);
- packet.writeD(1);
- packet.writeD(_isOnline);
- packet.writeD(_pledgeType);
- packet.writeD(_hasSponsor);
- return true;
+ ServerPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(this);
+ writeString(_name);
+ writeInt(_level);
+ writeInt(_classId);
+ writeInt(0);
+ writeInt(1);
+ writeInt(_isOnline);
+ writeInt(_pledgeType);
+ writeInt(_hasSponsor);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
index 226541c8b8..b5da580875 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.clan.Clan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Format: (ch) d [dd].
* @author -Wooden-
*/
-public class PledgeSkillList implements IClientOutgoingPacket
+public class PledgeSkillList extends ServerPacket
{
private final Collection _skills;
@@ -37,15 +36,14 @@ public class PledgeSkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet);
- packet.writeD(_skills.size());
+ ServerPackets.PLEDGE_SKILL_LIST.writeId(this);
+ writeInt(_skills.size());
for (Skill skill : _skills)
{
- packet.writeD(skill.getId());
- packet.writeD(skill.getLevel());
+ writeInt(skill.getId());
+ writeInt(skill.getLevel());
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
index 67d23eeddc..9025cd271d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.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;
/**
* Format: (ch) dd
* @author -Wooden-
*/
-public class PledgeSkillListAdd implements IClientOutgoingPacket
+public class PledgeSkillListAdd extends ServerPacket
{
private final int _id;
private final int _level;
@@ -35,11 +34,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);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
index 474cceb7f4..407d905392 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
@@ -16,15 +16,14 @@
*/
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;
/**
* sample 0000: cd b0 98 a0 48 1e 01 00 00 00 00 00 00 00 00 00 ....H........... 0010: 00 00 00 00 00 ..... format ddddd
* @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class PledgeStatusChanged implements IClientOutgoingPacket
+public class PledgeStatusChanged extends ServerPacket
{
private final Clan _clan;
@@ -34,16 +33,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.getClanId());
- 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.getClanId());
+ writeInt(_clan.getCrestId());
+ writeInt(_clan.getAllyId());
+ writeInt(_clan.getAllyCrestId());
+ writeInt(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
index 984a03f0be..13a182fd01 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.TradeList.TradeItem;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @version $Revision: 1.7.2.2.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class PrivateStoreListBuy implements IClientOutgoingPacket
+public class PrivateStoreListBuy extends ServerPacket
{
private final Player _storePlayer;
private final Player _player;
@@ -55,26 +54,25 @@ public class PrivateStoreListBuy implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_LIST_BUY.writeId(packet);
- packet.writeD(_storePlayer.getObjectId());
- packet.writeD(_playerAdena);
- packet.writeD(_items.size());
+ ServerPackets.PRIVATE_STORE_LIST_BUY.writeId(this);
+ writeInt(_storePlayer.getObjectId());
+ writeInt(_playerAdena);
+ writeInt(_items.size());
for (TradeList.TradeItem item : _items)
{
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItem().getItemId());
- packet.writeH(item.getEnchant());
+ writeInt(item.getObjectId());
+ writeInt(item.getItem().getItemId());
+ writeShort(item.getEnchant());
// writeD(item.getCount()); //give max possible sell amount
- packet.writeD(item.getCurCount());
- packet.writeD(item.getItem().getReferencePrice());
- packet.writeH(0);
- packet.writeD(item.getItem().getBodyPart());
- packet.writeH(item.getItem().getType2());
- packet.writeD(item.getPrice()); // buyers price
- packet.writeD(item.getCount()); // maximum possible tradecount
+ writeInt(item.getCurCount());
+ writeInt(item.getItem().getReferencePrice());
+ writeShort(0);
+ writeInt(item.getItem().getBodyPart());
+ writeShort(item.getItem().getType2());
+ writeInt(item.getPrice()); // buyers price
+ writeInt(item.getCount()); // maximum possible tradecount
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
index 9203b12174..2f6d67bbe7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.TradeList.TradeItem;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* @version $Revision: 1.2.2.3.2.6 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PrivateStoreListSell implements IClientOutgoingPacket
+public class PrivateStoreListSell extends ServerPacket
{
private final Player _storePlayer;
private final Player _player;
@@ -57,26 +56,25 @@ public class PrivateStoreListSell implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_LIST_SELL.writeId(packet);
- packet.writeD(_storePlayer.getObjectId());
- packet.writeD(_packageSale ? 1 : 0);
- packet.writeD(_playerAdena);
- packet.writeD(_items.size());
+ ServerPackets.PRIVATE_STORE_LIST_SELL.writeId(this);
+ writeInt(_storePlayer.getObjectId());
+ writeInt(_packageSale);
+ writeInt(_playerAdena);
+ writeInt(_items.size());
for (TradeList.TradeItem item : _items)
{
- packet.writeD(item.getItem().getType2());
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItem().getItemId());
- packet.writeD(item.getCount());
- packet.writeH(0);
- packet.writeH(item.getEnchant());
- packet.writeH(0);
- packet.writeD(item.getItem().getBodyPart());
- packet.writeD(item.getPrice()); // your price
- packet.writeD(item.getItem().getReferencePrice()); // store price
+ writeInt(item.getItem().getType2());
+ writeInt(item.getObjectId());
+ writeInt(item.getItem().getItemId());
+ writeInt(item.getCount());
+ writeShort(0);
+ writeShort(item.getEnchant());
+ writeShort(0);
+ writeInt(item.getItem().getBodyPart());
+ writeInt(item.getPrice()); // your price
+ writeInt(item.getItem().getReferencePrice()); // store price
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
index 0d2746c456..787b45298f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.TradeList.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;
/**
* @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/03/27 15:29:40 $
*/
-public class PrivateStoreManageListBuy implements IClientOutgoingPacket
+public class PrivateStoreManageListBuy extends ServerPacket
{
private final Player _player;
private int _playerAdena;
@@ -52,38 +51,37 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_MANAGE_LIST_BUY.writeId(packet);
+ ServerPackets.PRIVATE_STORE_MANAGE_LIST_BUY.writeId(this);
// section 1
- packet.writeD(_player.getObjectId());
- packet.writeD(_playerAdena);
+ writeInt(_player.getObjectId());
+ writeInt(_playerAdena);
// section2
- packet.writeD(_itemList.size()); // inventory items for potential buy
+ writeInt(_itemList.size()); // inventory items for potential buy
for (Item item : _itemList)
{
- packet.writeD(item.getItemId());
- packet.writeH(item.getEnchantLevel()); // show enchant level, but you can't buy enchanted weapons because of L2 Interlude Client bug
- packet.writeD(item.getCount());
- packet.writeD(item.getReferencePrice());
- packet.writeH(0);
- packet.writeD(item.getTemplate().getBodyPart());
- packet.writeH(item.getTemplate().getType2());
+ writeInt(item.getItemId());
+ writeShort(item.getEnchantLevel()); // show enchant level, but you can't buy enchanted weapons because of L2 Interlude Client bug
+ writeInt(item.getCount());
+ writeInt(item.getReferencePrice());
+ writeShort(0);
+ writeInt(item.getTemplate().getBodyPart());
+ writeShort(item.getTemplate().getType2());
}
// 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 (TradeList.TradeItem item : _buyList)
{
- packet.writeD(item.getItem().getItemId());
- packet.writeH(item.getEnchant());
- packet.writeD(item.getCount());
- packet.writeD(item.getItem().getReferencePrice());
- packet.writeH(0);
- packet.writeD(item.getItem().getBodyPart());
- packet.writeH(item.getItem().getType2());
- packet.writeD(item.getPrice()); // your price
- packet.writeD(item.getItem().getReferencePrice()); // fixed store price
+ writeInt(item.getItem().getItemId());
+ writeShort(item.getEnchant());
+ writeInt(item.getCount());
+ writeInt(item.getItem().getReferencePrice());
+ writeShort(0);
+ writeInt(item.getItem().getBodyPart());
+ writeShort(item.getItem().getType2());
+ writeInt(item.getPrice()); // your price
+ writeInt(item.getItem().getReferencePrice()); // fixed store price
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
index aeec1f72f7..a9d9eed514 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
@@ -19,10 +19,9 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeList.TradeItem;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* 3 section to this packet 1)playerinfo which is always sent dd 2)list of items which can be added to sell d(hhddddhhhd) 3)list of items which have already been setup for sell in previous sell private store sell manageent d(hhddddhhhdd) *
@@ -31,7 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
/*
* In memory of our friend Vadim 03/11/2014
*/
-public class PrivateStoreManageListSell implements IClientOutgoingPacket
+public class PrivateStoreManageListSell extends ServerPacket
{
private final Player _player;
private int _playerAdena;
@@ -60,42 +59,41 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket
* During store set no packets will be received from client just when store definition is finished.
*/
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_MANAGE_LIST_SELL.writeId(packet);
+ ServerPackets.PRIVATE_STORE_MANAGE_LIST_SELL.writeId(this);
// section 1
- packet.writeD(_player.getObjectId());
- packet.writeD(_packageSale ? 1 : 0); // Package sell
- packet.writeD(_playerAdena);
+ writeInt(_player.getObjectId());
+ writeInt(_packageSale); // Package sell
+ writeInt(_playerAdena);
// section2
- packet.writeD(_itemList.size()); // for potential sells
+ writeInt(_itemList.size()); // for potential sells
for (TradeItem item : _itemList)
{
- packet.writeD(item.getItem().getType2());
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItem().getItemId());
- packet.writeD(item.getCount());
- packet.writeH(0);
- packet.writeH(item.getEnchant()); // enchant level
- packet.writeH(0);
- packet.writeD(item.getItem().getBodyPart());
- packet.writeD(item.getPrice()); // store price
+ writeInt(item.getItem().getType2());
+ writeInt(item.getObjectId());
+ writeInt(item.getItem().getItemId());
+ writeInt(item.getCount());
+ writeShort(0);
+ writeShort(item.getEnchant()); // enchant level
+ writeShort(0);
+ writeInt(item.getItem().getBodyPart());
+ writeInt(item.getPrice()); // store price
}
// 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)
{
- packet.writeD(item.getItem().getType2());
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItem().getItemId());
- packet.writeD(item.getCount());
- packet.writeH(0);
- packet.writeH(item.getEnchant()); // enchant level
- packet.writeH(0);
- packet.writeD(item.getItem().getBodyPart());
- packet.writeD(item.getPrice()); // your price
- packet.writeD(item.getItem().getReferencePrice()); // store price
+ writeInt(item.getItem().getType2());
+ writeInt(item.getObjectId());
+ writeInt(item.getItem().getItemId());
+ writeInt(item.getCount());
+ writeShort(0);
+ writeShort(item.getEnchant()); // enchant level
+ writeShort(0);
+ writeInt(item.getItem().getBodyPart());
+ writeInt(item.getPrice()); // your price
+ writeInt(item.getItem().getReferencePrice()); // store price
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
index e62c53cc1b..a042c4e8b3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.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;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PrivateStoreMsgBuy implements IClientOutgoingPacket
+public class PrivateStoreMsgBuy extends ServerPacket
{
private final Player _player;
private String _storeMsg;
@@ -38,11 +37,10 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_MSG_BUY.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeS(_storeMsg);
- return true;
+ ServerPackets.PRIVATE_STORE_MSG_BUY.writeId(this);
+ writeInt(_player.getObjectId());
+ writeString(_storeMsg);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
index eeb9ab74d6..1788583e07 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.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;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class PrivateStoreMsgSell implements IClientOutgoingPacket
+public class PrivateStoreMsgSell extends ServerPacket
{
private final Player _player;
private String _storeMsg;
@@ -38,11 +37,10 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PRIVATE_STORE_MSG_SELL.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeS(_storeMsg);
- return true;
+ ServerPackets.PRIVATE_STORE_MSG_SELL.writeId(this);
+ writeInt(_player.getObjectId());
+ writeString(_storeMsg);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
index 3eb3fc8132..bde5c60c20 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java
@@ -18,12 +18,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.quest.QuestState;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class QuestList implements IClientOutgoingPacket
+public class QuestList extends ServerPacket
{
private final Collection _questStates;
@@ -33,23 +32,22 @@ public class QuestList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.QUEST_LIST.writeId(packet);
- packet.writeH(_questStates.size());
+ ServerPackets.QUEST_LIST.writeId(this);
+ writeShort(_questStates.size());
for (QuestState qs : _questStates)
{
- packet.writeD(qs.getQuest().getQuestId());
+ writeInt(qs.getQuest().getQuestId());
final int states = qs.getInt("__compltdStateFlags");
if (states != 0)
{
- packet.writeD(states);
+ writeInt(states);
}
else
{
- packet.writeD(qs.getCond());
+ writeInt(qs.getCond());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java
index 199c005aea..c9a7fc45b3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java
+++ b/L2J_Mobius_C6_Interlude/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;
@@ -45,14 +44,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); // x
- packet.writeD(_y); // y
- packet.writeD(_z); // z
- return true;
+ ServerPackets.RADAR_CONTROL.writeId(this);
+ writeInt(_showRadar);
+ writeInt(_type); // maybe type
+ writeInt(_x); // x
+ writeInt(_y); // y
+ writeInt(_z); // z
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
index 16d886b61c..fb557b872e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
@@ -18,15 +18,14 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.RecipeList;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* format d d(dd)
* @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class RecipeBookItemList implements IClientOutgoingPacket
+public class RecipeBookItemList extends ServerPacket
{
private Collection _recipes;
private final boolean _isDwarvenCraft;
@@ -44,26 +43,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
index 65db792c93..b09a2ccd96 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
@@ -16,16 +16,16 @@
*/
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;
/**
* format dddd
*/
-public class RecipeItemMakeInfo implements IClientOutgoingPacket
+public class RecipeItemMakeInfo extends ServerPacket
{
private final int _id;
private final Player _player;
@@ -46,18 +46,20 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final RecipeList recipe = RecipeData.getInstance().getRecipe(_id);
- if (recipe != null)
+ if (recipe == null)
{
- OutgoingPackets.RECIPE_ITEM_MAKE_INFO.writeId(packet);
- packet.writeD(_id);
- packet.writeD(recipe.isDwarvenRecipe() ? 0 : 1); // 0 = Dwarven - 1 = Common
- packet.writeD((int) _player.getCurrentMp());
- packet.writeD(_player.getMaxMp());
- packet.writeD(_success ? 1 : 0); // item creation success/failed
+ 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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
index 40bd2f3cef..a21dfa1c75 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.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;
/**
* ddddd
*/
-public class RecipeShopItemInfo implements IClientOutgoingPacket
+public class RecipeShopItemInfo extends ServerPacket
{
private final Player _player;
private final int _recipeId;
@@ -35,14 +34,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
index 85ada022ba..9264cf330d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
@@ -18,17 +18,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.ManufactureList;
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;
/**
* dd d(dd) d(ddd)
*/
-public class RecipeShopManageList implements IClientOutgoingPacket
+public class RecipeShopManageList extends ServerPacket
{
private final Player _seller;
private final boolean _isDwarven;
@@ -61,42 +60,41 @@ 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(_seller.getAdena());
- packet.writeD(_isDwarven ? 0 : 1);
+ ServerPackets.RECIPE_SHOP_MANAGE_LIST.writeId(this);
+ writeInt(_seller.getObjectId());
+ writeInt(_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.getCreateList() == null)
{
- packet.writeD(0);
+ writeInt(0);
}
else
{
final ManufactureList list = _seller.getCreateList();
- packet.writeD(list.size());
+ writeInt(list.size());
for (ManufactureItem item : list.getList())
{
- packet.writeD(item.getRecipeId());
- packet.writeD(0);
- packet.writeD(item.getCost());
+ writeInt(item.getRecipeId());
+ writeInt(0);
+ writeInt(item.getCost());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
index 1facbbf5e2..40ddb064ca 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
+++ b/L2J_Mobius_C6_Interlude/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.getCreateList().getStoreName());
- return true;
+ ServerPackets.RECIPE_SHOP_MSG.writeId(this);
+ writeInt(_player.getObjectId());
+ writeString(_player.getCreateList().getStoreName());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
index be9565ef86..cc419a224b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
@@ -16,13 +16,12 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.ManufactureList;
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 _player;
@@ -34,24 +33,23 @@ public class RecipeShopSellList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
final ManufactureList createList = _player.getCreateList();
if (createList != null)
{
- OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet);
- packet.writeD(_player.getObjectId());
- packet.writeD((int) _player.getCurrentMp()); // Creator's MP
- packet.writeD(_player.getMaxMp()); // Creator's MP
- packet.writeD(_buyer.getAdena()); // Buyer Adena
- packet.writeD(createList.size());
+ ServerPackets.RECIPE_SHOP_SELL_LIST.writeId(this);
+ writeInt(_player.getObjectId());
+ writeInt((int) _player.getCurrentMp()); // Creator's MP
+ writeInt(_player.getMaxMp()); // Creator's MP
+ writeInt(_buyer.getAdena()); // Buyer Adena
+ writeInt(createList.size());
for (ManufactureItem item : createList.getList())
{
- packet.writeD(item.getRecipeId());
- packet.writeD(0); // unknown
- packet.writeD(item.getCost());
+ writeInt(item.getRecipeId());
+ writeInt(0); // unknown
+ writeInt(item.getCost());
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
index 232eea96be..cf8744ad93 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
@@ -16,16 +16,15 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.Playable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.actor.instance.Servitor;
-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_PVP_FLAG = 0x00002; // pvp ???
public static final int RELATION_HAS_KARMA = 0x00004; // karma ???
@@ -39,7 +38,7 @@ public class RelationChanged implements IClientOutgoingPacket
private final int _objId;
private final int _relation;
- private final int _autoAttackable;
+ private final boolean _autoAttackable;
private int _karma;
private int _pvpFlag;
@@ -47,7 +46,7 @@ public class RelationChanged implements IClientOutgoingPacket
{
_objId = activeChar.getObjectId();
_relation = relation;
- _autoAttackable = autoattackable ? 1 : 0;
+ _autoAttackable = autoattackable;
if (activeChar instanceof Player)
{
_karma = ((Player) activeChar).getKarma();
@@ -61,14 +60,13 @@ public class RelationChanged implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RELATION_CHANGED.writeId(packet);
- packet.writeD(_objId);
- packet.writeD(_relation);
- packet.writeD(_autoAttackable);
- packet.writeD(_karma);
- packet.writeD(_pvpFlag);
- return true;
+ ServerPackets.RELATION_CHANGED.writeId(this);
+ writeInt(_objId);
+ writeInt(_relation);
+ writeInt(_autoAttackable);
+ writeInt(_karma);
+ writeInt(_pvpFlag);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
index f089288a78..9ca9a183bc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.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;
/**
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-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);
@@ -42,11 +41,10 @@ public class RestartResponse implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RESTART_RESPONSE.writeId(packet);
- packet.writeD(_result ? 1 : 0);
- packet.writeS(_message);
- return true;
+ ServerPackets.RESTART_RESPONSE.writeId(this);
+ writeInt(_result);
+ writeString(_message);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java
index a0487f1cde..d340b426cb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java
@@ -16,15 +16,14 @@
*/
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;
/**
* sample 0000: 0c 9b da 12 40 ....@ format d
* @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:40 $
*/
-public class Revive implements IClientOutgoingPacket
+public class Revive extends ServerPacket
{
private final int _objectId;
@@ -34,10 +33,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java
index 7bb072cdf5..cd63df6ceb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ride.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 Ride implements IClientOutgoingPacket
+public class Ride extends ServerPacket
{
public static final int ACTION_MOUNT = 1;
public static final int ACTION_DISMOUNT = 0;
@@ -52,13 +51,12 @@ public class Ride implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.RIDE.writeId(packet);
- packet.writeD(_id);
- packet.writeD(_bRide);
- packet.writeD(_rideType);
- packet.writeD(_rideClassID);
- return true;
+ ServerPackets.RIDE.writeId(this);
+ writeInt(_id);
+ writeInt(_bRide);
+ writeInt(_rideType);
+ writeInt(_rideClassID);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java
index 21da1dc898..ee6177df77 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java
@@ -16,19 +16,18 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Player;
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;
/**
* Seven Signs Record Update packet type id 0xf5 format: c cc (Page Num = 1 -> 4, period) 1: [ddd cc dd ddd c ddd c] 2: [hc [cd (dc (S))] 3: [ccc (cccc)] 4: [(cchh)]
* @author Tempy
*/
-public class SSQStatus implements IClientOutgoingPacket
+public class SSQStatus extends ServerPacket
{
private final Player _activevChar;
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.THIS_IS_A_QUEST_EVENT_PERIOD.getId());
+ writeInt(SystemMessageId.THIS_IS_A_QUEST_EVENT_PERIOD.getId());
break;
}
case SevenSigns.PERIOD_COMP_RESULTS:
{
- packet.writeD(SystemMessageId.THIS_IS_A_PERIOD_OF_CALCULATING_STATISTICS_IN_THE_SERVER.getId());
+ writeInt(SystemMessageId.THIS_IS_A_PERIOD_OF_CALCULATING_STATISTICS_IN_THE_SERVER.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(_activevChar));
- packet.writeC(SevenSigns.getInstance().getPlayerSeal(_activevChar));
- packet.writeD(SevenSigns.getInstance().getPlayerStoneContrib(_activevChar)); // Seal Stones Turned-In
- packet.writeD(SevenSigns.getInstance().getPlayerAdenaCollect(_activevChar)); // Ancient Adena to Collect
+ writeByte(SevenSigns.getInstance().getPlayerCabal(_activevChar));
+ writeByte(SevenSigns.getInstance().getPlayerSeal(_activevChar));
+ writeInt(SevenSigns.getInstance().getPlayerStoneContrib(_activevChar)); // Seal Stones Turned-In
+ writeInt(SevenSigns.getInstance().getPlayerAdenaCollect(_activevChar)); // 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.writeD(duskStoneScoreProp); // Seal Stone Score
- packet.writeD(duskFestivalScore); // Festival Score
- packet.writeD(duskTotalScore); // Total Score
- packet.writeC(duskPercent); // Dusk %
+ writeInt(duskStoneScoreProp); // Seal Stone Score
+ writeInt(duskFestivalScore); // Festival Score
+ writeInt(duskTotalScore); // Total Score
+ writeByte(duskPercent); // Dusk %
/* DAWN */
- packet.writeD(dawnStoneScoreProp); // Seal Stone Score
- packet.writeD(dawnFestivalScore); // Festival Score
- packet.writeD(dawnTotalScore); // Total Score
- packet.writeC(dawnPercent); // Dawn %
+ writeInt(dawnStoneScoreProp); // Seal Stone Score
+ writeInt(dawnFestivalScore); // Festival Score
+ writeInt(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.writeD(duskScore);
+ writeInt(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.writeD(dawnScore);
+ writeInt(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,37 +182,37 @@ 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));
}
}
break;
@@ -221,8 +220,8 @@ public class SSQStatus implements IClientOutgoingPacket
case 4:
{
// c cc [cc (cchh)]
- 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);
@@ -230,7 +229,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:
@@ -239,21 +238,21 @@ public class SSQStatus implements IClientOutgoingPacket
{
case SevenSigns.CABAL_NULL:
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeShort(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.writeH(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_SINCE_35_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_DAWN);
+ writeShort(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_SINCE_35_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(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);
+ writeShort(SystemMessageId.SINCE_THE_SEAL_WAS_NOT_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_SINCE_LESS_THAN_35_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -261,13 +260,13 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (duskPercent >= 35)
{
- packet.writeC(SevenSigns.CABAL_DUSK);
- packet.writeH(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_SINCE_35_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_DUSK);
+ writeShort(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_SINCE_35_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(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);
+ writeShort(SystemMessageId.SINCE_THE_SEAL_WAS_NOT_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_SINCE_LESS_THAN_35_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -282,25 +281,25 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (dawnPercent >= 10)
{
- packet.writeC(SevenSigns.CABAL_DAWN);
- packet.writeH(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_DAWN);
+ writeShort(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
break;
}
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeShort(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
break;
}
case SevenSigns.CABAL_DAWN:
{
if (dawnPercent >= 10)
{
- packet.writeC(sealOwner);
- packet.writeH(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(sealOwner);
+ writeShort(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_BECAUSE_LESS_THAN_10_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeShort(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_BECAUSE_LESS_THAN_10_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -308,18 +307,18 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (duskPercent >= 35)
{
- packet.writeC(SevenSigns.CABAL_DUSK);
- packet.writeH(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_SINCE_35_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_DUSK);
+ writeShort(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_SINCE_35_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
}
else if (dawnPercent >= 10)
{
- packet.writeC(SevenSigns.CABAL_DAWN);
- packet.writeH(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_DAWN);
+ writeShort(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_BECAUSE_LESS_THAN_10_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeShort(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_BECAUSE_LESS_THAN_10_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -334,30 +333,30 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (duskPercent >= 10)
{
- packet.writeC(SevenSigns.CABAL_DUSK);
- packet.writeH(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_DUSK);
+ writeShort(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
break;
}
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(SystemMessageId.THE_COMPETITION_HAS_ENDED_IN_A_TIE_THEREFORE_NOBODY_HAS_BEEN_AWARDED_THE_SEAL.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeShort(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.writeH(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_SINCE_35_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_DAWN);
+ writeShort(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_NOT_OWNED_SINCE_35_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
}
else if (duskPercent >= 10)
{
- packet.writeC(sealOwner);
- packet.writeH(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(sealOwner);
+ writeShort(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_BECAUSE_LESS_THAN_10_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeShort(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_BECAUSE_LESS_THAN_10_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -365,13 +364,13 @@ public class SSQStatus implements IClientOutgoingPacket
{
if (duskPercent >= 10)
{
- packet.writeC(sealOwner);
- packet.writeH(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
+ writeByte(sealOwner);
+ writeShort(SystemMessageId.SINCE_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_AND_10_PERCENT_OR_MORE_PEOPLE_HAVE_VOTED.getId());
}
else
{
- packet.writeC(SevenSigns.CABAL_NULL);
- packet.writeH(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_BECAUSE_LESS_THAN_10_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
+ writeByte(SevenSigns.CABAL_NULL);
+ writeShort(SystemMessageId.ALTHOUGH_THE_SEAL_WAS_OWNED_DURING_THE_PREVIOUS_PERIOD_BECAUSE_LESS_THAN_10_PERCENT_OF_PEOPLE_HAVE_VOTED.getId());
}
break;
}
@@ -379,11 +378,10 @@ public class SSQStatus implements IClientOutgoingPacket
break;
}
}
- packet.writeH(0);
+ writeShort(0);
}
break;
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java
index 10943f0bae..5181d55fd5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java
@@ -20,16 +20,15 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ItemLocation;
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;
/**
* @version $Revision: 1.4.2.3.2.4 $ $Date: 2005/03/27 15:29:39 $
*/
-public class SellList implements IClientOutgoingPacket
+public class SellList extends ServerPacket
{
private final Player _player;
private final int _money;
@@ -54,26 +53,25 @@ public class SellList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SELL_LIST.writeId(packet);
- packet.writeD(_money);
- packet.writeD(0);
- packet.writeH(_selllist.size());
+ ServerPackets.SELL_LIST.writeId(this);
+ writeInt(_money);
+ writeInt(0);
+ writeShort(_selllist.size());
for (Item item : _selllist)
{
- packet.writeH(item.getTemplate().getType1());
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItemId());
- packet.writeD(item.getCount());
- packet.writeH(item.getTemplate().getType2());
- packet.writeH(0);
- packet.writeD(item.getTemplate().getBodyPart());
- packet.writeH(item.getEnchantLevel());
- packet.writeH(0);
- packet.writeH(0);
- packet.writeD(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getTemplate().getReferencePrice() / 2);
+ writeShort(item.getTemplate().getType1());
+ writeInt(item.getObjectId());
+ writeInt(item.getItemId());
+ writeInt(item.getCount());
+ writeShort(item.getTemplate().getType2());
+ writeShort(0);
+ writeInt(item.getTemplate().getBodyPart());
+ writeShort(item.getEnchantLevel());
+ writeShort(0);
+ writeShort(0);
+ writeInt(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getTemplate().getReferencePrice() / 2);
}
- return true;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
index 998ca9152d..7510f88678 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
@@ -22,15 +22,14 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ItemLocation;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.CastleManorManager.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 Player _player;
private final int _money;
@@ -55,23 +54,22 @@ public class SellListProcure implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SELL_LIST_PROCURE.writeId(packet);
- packet.writeD(_money); // money
- packet.writeD(0); // lease ?
- packet.writeH(_sellList.size()); // list size
+ ServerPackets.SELL_LIST_PROCURE.writeId(this);
+ writeInt(_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.getItemId());
- packet.writeD(entry.getValue()); // count
- packet.writeH(item.getTemplate().getType2());
- packet.writeH(0); // unknown
- packet.writeD(0); // price, you shouldnt get any adena for crops, only raw materials
+ writeShort(item.getTemplate().getType1());
+ writeInt(item.getObjectId());
+ writeInt(item.getItemId());
+ writeInt(entry.getValue()); // count
+ writeShort(item.getTemplate().getType2());
+ writeShort(0); // unknown
+ writeInt(0); // price, you shouldnt get any adena for crops, only raw materials
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
index 4e04154474..6c3d97fa2c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Macro;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* packet type id 0xe7 sample e7 d // unknown change of Macro edit,add,delete c // unknown c //count of Macros c // unknown d // id S // macro name S // desc S // acronym c // icon c // count c // entry c // type d // skill id c // shortcut id S // command name format: cdhcdSSScc (ccdcS)
*/
-public class SendMacroList implements IClientOutgoingPacket
+public class SendMacroList extends ServerPacket
{
private final int _rev;
private final int _count;
@@ -37,54 +36,30 @@ public class SendMacroList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SEND_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.SEND_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.id); // Macro ID
- packet.writeS(_macro.name); // Macro Name
- packet.writeS(_macro.descr); // Desc
- packet.writeS(_macro.acronym); // acronym
- packet.writeC(_macro.icon); // icon
- packet.writeC(_macro.commands.length); // count
+ writeInt(_macro.id); // Macro ID
+ writeString(_macro.name); // Macro Name
+ writeString(_macro.descr); // Desc
+ writeString(_macro.acronym); // acronym
+ writeByte(_macro.icon); // icon
+ writeByte(_macro.commands.length); // count
for (int i = 0; i < _macro.commands.length; i++)
{
final Macro.MacroCmd cmd = _macro.commands[i];
- packet.writeC(i + 1); // i of count
- packet.writeC(cmd.type); // type 1 = skill, 3 = action, 4 = shortcut
- packet.writeD(cmd.d1); // skill id
- packet.writeC(cmd.d2); // shortcut id
- packet.writeS(cmd.cmd); // command name
+ writeByte(i + 1); // i of count
+ writeByte(cmd.type); // type 1 = skill, 3 = action, 4 = shortcut
+ writeInt(cmd.d1); // skill id
+ writeByte(cmd.d2); // shortcut id
+ writeString(cmd.cmd); // command name
}
}
- // writeD(1); //unknown change of Macro edit,add,delete
- // packet.writeC(0); //unknown
- // packet.writeC(1); //count of Macros
- // packet.writeC(1); //unknown
- //
- // writeD(1430); //Macro ID
- // writeS("Admin"); //Macro Name
- // writeS("Admin Command"); //Desc
- // writeS("ADM"); //acronym
- // packet.writeC(0); //icon
- // packet.writeC(2); //count
- //
- // packet.writeC(1); //i of count
- // packet.writeC(3); //type 1 = skill, 3 = action, 4 = shortcut
- // writeD(0); // skill id
- // packet.writeC(0); // shortcut id
- // writeS("/loc"); // command name
- //
- // packet.writeC(2); //i of count
- // packet.writeC(3); //type 1 = skill, 3 = action, 4 = shortcut
- // writeD(0); // skill id
- // packet.writeC(0); // shortcut id
- // writeS("//admin"); // command name
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeDone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeDone.java
index 31f922d34e..e0cf3ec6d5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeDone.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeDone.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;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
-public class SendTradeDone implements IClientOutgoingPacket
+public class SendTradeDone extends ServerPacket
{
private final int _num;
@@ -32,10 +31,9 @@ public class SendTradeDone implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SEND_TRADE_DONE.writeId(packet);
- packet.writeD(_num);
- return true;
+ ServerPackets.SEND_TRADE_DONE.writeId(this);
+ writeInt(_num);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
index b889148eae..d4a564dcf9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.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;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:40 $
*/
-public class SendTradeRequest implements IClientOutgoingPacket
+public class SendTradeRequest extends ServerPacket
{
private final int _senderID;
@@ -32,10 +31,9 @@ public class SendTradeRequest implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SEND_TRADE_REQUEST.writeId(packet);
- packet.writeD(_senderID);
- return true;
+ ServerPackets.SEND_TRADE_REQUEST.writeId(this);
+ writeInt(_senderID);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java
index e914eb0da5..53a4603beb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerClose.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 devScarlet & mrTJO
*/
-public class ServerClose implements IClientOutgoingPacket
+public class ServerClose extends ServerPacket
{
public static final ServerClose STATIC_PACKET = new ServerClose();
@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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
similarity index 59%
rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
index 35ff495b46..559fe62fce 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerPacket.java
@@ -16,15 +16,36 @@
*/
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;
/**
- * @author KenM
+ * @author Mobius
*/
-public interface IClientOutgoingPacket extends IOutgoingPacket
+public abstract class ServerPacket extends WritablePacket
{
- 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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
index db12dfc8ae..ec53757512 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.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;
/**
* format (c) dd
* @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:40 $
*/
-public class SetSummonRemainTime implements IClientOutgoingPacket
+public class SetSummonRemainTime extends ServerPacket
{
private final int _maxTime;
private final int _remainingTime;
@@ -35,11 +34,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
index b252d90ded..5dc4627a27 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetupGauge.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;
/**
* sample 0000: 85 00 00 00 00 f0 1a 00 00
* @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class SetupGauge implements IClientOutgoingPacket
+public class SetupGauge extends ServerPacket
{
public static final int BLUE = 0;
public static final int RED = 1;
@@ -39,12 +38,11 @@ public class SetupGauge implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SETUP_GAUGE.writeId(packet);
- packet.writeD(_dat1);
- packet.writeD(_time);
- packet.writeD(_time); // c2
- return true;
+ ServerPackets.SETUP_GAUGE.writeId(this);
+ writeInt(_dat1);
+ writeInt(_time);
+ writeInt(_time); // c2
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
index bc7fc1f221..ff27d0ffcc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
+++ b/L2J_Mobius_C6_Interlude/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
{
private final int _skillId;
private final int _skillLevel;
@@ -33,12 +32,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);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index ee06db8a52..19eaf3f7ff 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -18,16 +18,15 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ShortCut;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* ShortCutInit format d *(1dddd)/(2ddddd)/(3dddd)
* @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/03/27 15:29:39 $
*/
-public class ShortCutInit implements IClientOutgoingPacket
+public class ShortCutInit extends ServerPacket
{
private Collection _shortCuts;
private Player _player;
@@ -43,60 +42,59 @@ 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());
- packet.writeD(sc.getSlot() + (sc.getPage() * 12));
+ writeInt(sc.getType());
+ writeInt(sc.getSlot() + (sc.getPage() * 12));
switch (sc.getType())
{
case ShortCut.TYPE_ITEM: // 1
{
- packet.writeD(sc.getId());
- packet.writeD(1);
- packet.writeD(-1);
- packet.writeD(0);
- packet.writeD(0);
- packet.writeH(0);
- packet.writeH(0);
+ writeInt(sc.getId());
+ writeInt(1);
+ writeInt(-1);
+ writeInt(0);
+ writeInt(0);
+ writeShort(0);
+ writeShort(0);
break;
}
case ShortCut.TYPE_SKILL: // 2
{
- 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 ShortCut.TYPE_ACTION: // 3
{
- packet.writeD(sc.getId());
- packet.writeD(1); // C6
+ writeInt(sc.getId());
+ writeInt(1); // C6
break;
}
case ShortCut.TYPE_MACRO: // 4
{
- packet.writeD(sc.getId());
- packet.writeD(1); // C6
+ writeInt(sc.getId());
+ writeInt(1); // C6
break;
}
case ShortCut.TYPE_RECIPE: // 5
{
- packet.writeD(sc.getId());
- packet.writeD(1); // C6
+ writeInt(sc.getId());
+ writeInt(1); // C6
break;
}
default:
{
- packet.writeD(sc.getId());
- packet.writeD(1); // C6
+ writeInt(sc.getId());
+ writeInt(1); // C6
}
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 482630c619..03ea226e88 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -16,15 +16,14 @@
*/
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;
/**
* sample 56 01000000 04000000 dd9fb640 01000000 56 02000000 07000000 38000000 03000000 01000000 56 03000000 00000000 02000000 01000000 format dd d/dd/d d
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class ShortCutRegister implements IClientOutgoingPacket
+public class ShortCutRegister extends ServerPacket
{
private final ShortCut _shortcut;
@@ -38,46 +37,45 @@ public class ShortCutRegister implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet);
- packet.writeD(_shortcut.getType());
- packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client
+ ServerPackets.SHORT_CUT_REGISTER.writeId(this);
+ writeInt(_shortcut.getType());
+ writeInt(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client
switch (_shortcut.getType())
{
case ShortCut.TYPE_ITEM: // 1
{
- packet.writeD(_shortcut.getId());
+ writeInt(_shortcut.getId());
break;
}
case ShortCut.TYPE_SKILL: // 2
{
- packet.writeD(_shortcut.getId());
- packet.writeD(_shortcut.getLevel());
- packet.writeC(0); // C5
+ writeInt(_shortcut.getId());
+ writeInt(_shortcut.getLevel());
+ writeByte(0); // C5
break;
}
case ShortCut.TYPE_ACTION: // 3
{
- packet.writeD(_shortcut.getId());
+ writeInt(_shortcut.getId());
break;
}
case ShortCut.TYPE_MACRO: // 4
{
- packet.writeD(_shortcut.getId());
+ writeInt(_shortcut.getId());
break;
}
case ShortCut.TYPE_RECIPE: // 5
{
- packet.writeD(_shortcut.getId());
+ writeInt(_shortcut.getId());
break;
}
default:
{
- packet.writeD(_shortcut.getId());
+ writeInt(_shortcut.getId());
}
}
- packet.writeD(1); // ??
- return true;
+ writeInt(1); // ??
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
index 04e5e2a589..347efd3f85 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
@@ -18,11 +18,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.commons.util.StringUtil;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class ShowBoard implements IClientOutgoingPacket
+public class ShowBoard extends ServerPacket
{
public static final ShowBoard STATIC_SHOWBOARD_102 = new ShowBoard(null, "102");
public static final ShowBoard STATIC_SHOWBOARD_103 = new ShowBoard(null, "103");
@@ -53,19 +52,18 @@ public class ShowBoard implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_BOARD.writeId(packet);
- packet.writeC(1); // 1 to show, 0 to hide
- packet.writeS(TOP);
- packet.writeS(FAV);
- packet.writeS(REGION);
- packet.writeS(CLAN);
- packet.writeS(MEMO);
- packet.writeS(MAIL);
- packet.writeS(FRIENDS);
- packet.writeS(ADDFAV);
- packet.writeS(_htmlCode.toString());
- return true;
+ ServerPackets.SHOW_BOARD.writeId(this);
+ writeByte(1); // 1 to show, 0 to hide
+ writeString(TOP);
+ writeString(FAV);
+ writeString(REGION);
+ writeString(CLAN);
+ writeString(MEMO);
+ writeString(MAIL);
+ writeString(FRIENDS);
+ writeString(ADDFAV);
+ writeString(_htmlCode.toString());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
index b93ad1825a..26b175c147 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.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;
/**
* sample format d
* @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class ShowCalculator implements IClientOutgoingPacket
+public class ShowCalculator extends ServerPacket
{
private final int _calculatorId;
@@ -36,10 +35,9 @@ public class ShowCalculator implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_CALCULATOR.writeId(packet);
- packet.writeD(_calculatorId);
- return true;
+ ServerPackets.SHOW_CALCULATOR.writeId(this);
+ writeInt(_calculatorId);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
index 9abed31a61..04da4d804d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.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;
/**
* sample format d
* @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class ShowMiniMap implements IClientOutgoingPacket
+public class ShowMiniMap extends ServerPacket
{
private final int _mapId;
@@ -37,11 +36,10 @@ public class ShowMiniMap implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SHOW_MINI_MAP.writeId(packet);
- packet.writeD(_mapId);
- packet.writeD(SevenSigns.getInstance().getCurrentPeriod());
- return true;
+ ServerPackets.SHOW_MINI_MAP.writeId(this);
+ writeInt(_mapId);
+ writeInt(SevenSigns.getInstance().getCurrentPeriod());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
index 5b4e7eab78..1310514753 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.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;
/**
* Format: (ch)
* @author -Wooden-
*/
-public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket
+public class ShowPCCafeCouponShowUI extends ServerPacket
{
@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);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
index 0d6c3178c9..5a18147612 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowTownMap.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;
/**
* sample format d
* @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class ShowTownMap implements IClientOutgoingPacket
+public class ShowTownMap extends ServerPacket
{
private final String _texture;
private final int _x;
@@ -42,12 +41,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
index 49e00c6988..d034348241 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
index 6f219e334e..1338f98c2b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
+++ b/L2J_Mobius_C6_Interlude/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.Fort;
import org.l2jmobius.gameserver.model.siege.SiegeClan;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Populates the Siege Attacker List in the SiegeInfo Window _attackers;
@@ -69,19 +68,19 @@ public class SiegeAttackerList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SIEGE_ATTACKER_LIST.writeId(packet);
- packet.writeD(_residenceId);
- packet.writeD(0); // 0
- packet.writeD(1); // 1
- packet.writeD(0); // 0
+ ServerPackets.SIEGE_ATTACKER_LIST.writeId(this);
+ writeInt(_residenceId);
+ writeInt(0); // 0
+ writeInt(1); // 1
+ writeInt(0); // 0
final int size = _attackers.size();
if (size > 0)
{
Clan clan;
- packet.writeD(size);
- packet.writeD(size);
+ writeInt(size);
+ writeInt(size);
for (SiegeClan siegeclan : _attackers)
{
clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
@@ -89,22 +88,21 @@ public class SiegeAttackerList implements IClientOutgoingPacket
{
continue;
}
- packet.writeD(clan.getClanId());
- 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.getClanId());
+ 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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index bc75c1c5d4..b90d3d690d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.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.Fort;
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 _defenders;
@@ -73,19 +72,19 @@ public class SiegeDefenderList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SIEGE_DEFENDER_LIST.writeId(packet);
- packet.writeD(_residenceId);
- packet.writeD(0); // 0
- packet.writeD(1); // 1
- packet.writeD(0); // 0
+ ServerPackets.SIEGE_DEFENDER_LIST.writeId(this);
+ writeInt(_residenceId);
+ writeInt(0); // 0
+ writeInt(1); // 1
+ writeInt(0); // 0
final int size = _defenders.size() + _waiting.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 : _defenders)
{
@@ -94,59 +93,58 @@ public class SiegeDefenderList implements IClientOutgoingPacket
{
continue;
}
- packet.writeD(clan.getClanId());
- packet.writeS(clan.getName());
- packet.writeS(clan.getLeaderName());
- packet.writeD(clan.getCrestId());
- packet.writeD(0); // signed time (seconds) (not storated by L2J)
+ writeInt(clan.getClanId());
+ 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 : _waiting)
{
clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
- packet.writeD(clan.getClanId());
- 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.getClanId());
+ 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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
index 2070b79642..2729f672c9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
import org.l2jmobius.gameserver.network.PacketLogger;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* Shows the Siege Info _reuseTimestamps;
@@ -39,17 +38,16 @@ public class SkillCoolTime implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SKILL_COOL_TIME.writeId(packet);
- packet.writeD(_reuseTimestamps.size());
+ ServerPackets.SKILL_COOL_TIME.writeId(this);
+ writeInt(_reuseTimestamps.size());
for (Timestamp ts : _reuseTimestamps)
{
- 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;
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
index c4927e17bd..f867ccc1a9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.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;
/**
* sample 0000: 6d 0c 00 00 00 00 00 00 00 03 00 00 00 f3 03 00 m............... 0010: 00 00 00 00 00 01 00 00 00 f4 03 00 00 00 00 00 ................ 0020: 00 01 00 00 00 10 04 00 00 00 00 00 00 01 00 00 ................ 0030: 00 2c 04 00 00 00 00 00 00 03 00 00 00 99 04 00 .,.............. 0040:
@@ -25,7 +24,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
* 00 d6 00 00 00 01 00 00 00 01 00 00 ................ 0090: 00 f4 00 00 00 format d (ddd)
* @version $Revision: 1.3.2.1.2.5 $ $Date: 2005/03/27 15:29:39 $
*/
-public class SkillList implements IClientOutgoingPacket
+public class SkillList extends ServerPacket
{
private Skill[] _skills;
@@ -45,6 +44,8 @@ public class SkillList implements IClientOutgoingPacket
public SkillList()
{
+ super(1024);
+
_skills = new Skill[] {};
}
@@ -88,17 +89,16 @@ public class SkillList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SKILL_LIST.writeId(packet);
- packet.writeD(_skills.length);
+ ServerPackets.SKILL_LIST.writeId(this);
+ writeInt(_skills.length);
for (Skill temp : _skills)
{
- packet.writeD(temp.passive ? 1 : 0);
- packet.writeD(temp.level);
- packet.writeD(temp.id);
- packet.writeC(0); // c5
+ writeInt(temp.passive);
+ writeInt(temp.level);
+ writeInt(temp.id);
+ writeByte(0); // c5
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java
index 2daaee91cb..183f6a1fa3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.actor.Player;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* CDSDDSS -> (0xd5)(objId)(name)(0)(type)(speaker)(name)
*/
-public class Snoop implements IClientOutgoingPacket
+public class Snoop extends ServerPacket
{
private final Player _snooped;
private final ChatType _type;
@@ -40,15 +39,14 @@ public class Snoop implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SNOOP.writeId(packet);
- packet.writeD(_snooped.getObjectId());
- packet.writeS(_snooped.getName());
- packet.writeD(0); // ??
- packet.writeD(_type.getClientId());
- packet.writeS(_speaker);
- packet.writeS(_msg);
- return true;
+ ServerPackets.SNOOP.writeId(this);
+ writeInt(_snooped.getObjectId());
+ writeString(_snooped.getName());
+ writeInt(0); // ??
+ writeInt(_type.getClientId());
+ writeString(_speaker);
+ writeString(_msg);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java
index fbba8424c5..9fabef426c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.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;
/**
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class SocialAction implements IClientOutgoingPacket
+public class SocialAction extends ServerPacket
{
private final int _objectId;
private final int _actionId;
@@ -39,11 +38,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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index ac4feecd11..15432ae9c0 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -16,22 +16,21 @@
*/
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;
/**
* 15 ee cc 11 43 object id 39 00 00 00 item id 8f 14 00 00 x b7 f1 00 00 y 60 f2 ff ff z 01 00 00 00 show item count 7a 00 00 00 count . format dddddddd
* @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
-public class SpawnItem implements IClientOutgoingPacket
+public class SpawnItem extends ServerPacket
{
private final int _objectId;
private final int _itemId;
private final int _x;
private final int _y;
private final int _z;
- private final int _stackable;
+ private final boolean _stackable;
private final int _count;
public SpawnItem(Item item)
@@ -41,23 +40,22 @@ public class SpawnItem implements IClientOutgoingPacket
_x = item.getX();
_y = item.getY();
_z = item.getZ();
- _stackable = item.isStackable() ? 1 : 0;
+ _stackable = item.isStackable();
_count = item.getCount();
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SPAWN_ITEM.writeId(packet);
- packet.writeD(_objectId);
- packet.writeD(_itemId);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
+ ServerPackets.SPAWN_ITEM.writeId(this);
+ writeInt(_objectId);
+ writeInt(_itemId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
// only show item count if it is a stackable item
- packet.writeD(_stackable);
- packet.writeD(_count);
- packet.writeD(0); // c2
- return true;
+ writeInt(_stackable);
+ writeInt(_count);
+ writeInt(0); // c2
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
index c21a4b353d..956c160e3e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.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 SpecialCamera implements IClientOutgoingPacket
+public class SpecialCamera extends ServerPacket
{
private final int _id;
private final int _dist;
@@ -39,15 +38,14 @@ public class SpecialCamera implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.SPECIAL_CAMERA.writeId(packet);
- packet.writeD(_id);
- packet.writeD(_dist);
- packet.writeD(_yaw);
- packet.writeD(_pitch);
- packet.writeD(_time);
- packet.writeD(_duration);
- return true;
+ ServerPackets.SPECIAL_CAMERA.writeId(this);
+ writeInt(_id);
+ writeInt(_dist);
+ writeInt(_yaw);
+ writeInt(_pitch);
+ writeInt(_time);
+ writeInt(_duration);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
index 9efe1c7030..d23c4a9bb9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
+++ b/L2J_Mobius_C6_Interlude/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);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java
index f29a7fc7ba..4c03af6d2c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java
@@ -16,11 +16,10 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.actor.instance.StaticObject;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
-public class StaticObjectInfo implements IClientOutgoingPacket
+public class StaticObjectInfo extends ServerPacket
{
private final StaticObject _staticObject;
@@ -34,11 +33,10 @@ public class StaticObjectInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.STATIC_OBJECT.writeId(packet);
- packet.writeD(_staticObject.getStaticObjectId()); // staticObjectId
- packet.writeD(_staticObject.getObjectId()); // objectId
- return true;
+ ServerPackets.STATIC_OBJECT.writeId(this);
+ writeInt(_staticObject.getStaticObjectId()); // staticObjectId
+ writeInt(_staticObject.getObjectId()); // objectId
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
index 07db21369c..d349ffef33 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
@@ -19,9 +19,8 @@ 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.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* 01 // Packet Identifier- _itemList;
@@ -38,30 +37,30 @@ public class TradeStart implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
// 0x2e TradeStart d h (h dddhh dhhh)
if ((_player.getActiveTradeList() == null) || (_player.getActiveTradeList().getPartner() == null))
{
- return false;
+ return;
}
- OutgoingPackets.TRADE_START.writeId(packet);
- packet.writeD(_player.getActiveTradeList().getPartner().getObjectId());
- // writeD((_activeChar != null || _activeChar.getTransactionRequester() != null)? _activeChar.getTransactionRequester().getObjectId() : 0);
- packet.writeH(_itemList.size());
+
+ ServerPackets.TRADE_START.writeId(this);
+ writeInt(_player.getActiveTradeList().getPartner().getObjectId());
+ // writeInt((_activeChar != null || _activeChar.getTransactionRequester() != null)? _activeChar.getTransactionRequester().getObjectId() : 0);
+ writeShort(_itemList.size());
for (Item item : _itemList)// int i = 0; i < count; i++)
{
- packet.writeH(item.getTemplate().getType1()); // item type1
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItemId());
- packet.writeD(item.getCount());
- packet.writeH(item.getTemplate().getType2()); // item type2
- packet.writeH(0); // ?
- packet.writeD(item.getTemplate().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.getEnchantLevel()); // enchant level
- packet.writeH(0); // ?
- packet.writeH(0);
+ writeShort(item.getTemplate().getType1()); // item type1
+ writeInt(item.getObjectId());
+ writeInt(item.getItemId());
+ writeInt(item.getCount());
+ writeShort(item.getTemplate().getType2()); // item type2
+ writeShort(0); // ?
+ writeInt(item.getTemplate().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.getEnchantLevel()); // enchant level
+ writeShort(0); // ?
+ writeShort(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
index 4f121434f0..9b076a45c7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
@@ -19,17 +19,16 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import java.util.List;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.TradeList.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;
/**
* @author Beetle
*/
-public class TradeUpdate implements IClientOutgoingPacket
+public class TradeUpdate extends ServerPacket
{
private final Collection
- _items;
private final List
_tradeItems;
@@ -53,10 +52,10 @@ public class TradeUpdate implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TRADE_UPDATE.writeId(packet);
- packet.writeH(_tradeItems.size());
+ ServerPackets.TRADE_UPDATE.writeId(this);
+ writeShort(_tradeItems.size());
for (TradeItem item : _tradeItems)
{
int aveCount = getItemCount(item.getObjectId()) - item.getCount();
@@ -66,18 +65,17 @@ public class TradeUpdate implements IClientOutgoingPacket
aveCount = 1;
stackable = false;
}
- packet.writeH(stackable ? 3 : 2);
- packet.writeH(item.getItem().getType1()); // item type1
- packet.writeD(item.getObjectId());
- packet.writeD(item.getItem().getItemId());
- packet.writeD(aveCount);
- packet.writeH(item.getItem().getType2()); // item type2
- packet.writeH(0); // ?
- 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(0);
+ writeShort(stackable ? 3 : 2);
+ writeShort(item.getItem().getType1()); // item type1
+ writeInt(item.getObjectId());
+ writeInt(item.getItem().getItemId());
+ writeInt(aveCount);
+ writeShort(item.getItem().getType2()); // item type2
+ writeShort(0); // ?
+ 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(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
index c39eb0e606..42d0edc8d9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.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 TutorialCloseHtml implements IClientOutgoingPacket
+public class TutorialCloseHtml extends ServerPacket
{
public static final TutorialCloseHtml STATIC_PACKET = new TutorialCloseHtml();
@@ -28,9 +27,8 @@ public class TutorialCloseHtml implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TUTORIAL_CLOSE_HTML.writeId(packet);
- return true;
+ ServerPackets.TUTORIAL_CLOSE_HTML.writeId(this);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
index 728020c0b1..4053323c7a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
index 396bbd7779..5e6430a568 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.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 TutorialShowHtml implements IClientOutgoingPacket
+public class TutorialShowHtml extends ServerPacket
{
private final String _html;
@@ -29,10 +28,9 @@ public class TutorialShowHtml implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet);
- packet.writeS(_html);
- return true;
+ ServerPackets.TUTORIAL_SHOW_HTML.writeId(this);
+ writeString(_html);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
index 8745e5cd27..5c4668e83f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
+++ b/L2J_Mobius_C6_Interlude/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 _blink;
@@ -29,10 +28,9 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet);
- packet.writeD(_blink);
- return true;
+ ServerPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(this);
+ writeInt(_blink);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
index 034635e720..9211d3e2c7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.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.instancemanager.CursedWeaponsManager;
import org.l2jmobius.gameserver.model.actor.Creature;
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;
-public class UserInfo implements IClientOutgoingPacket
+public class UserInfo extends ServerPacket
{
private final Player _player;
private final Inventory _inventory;
@@ -56,212 +55,211 @@ 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.getBoat() != null ? _player.getBoat().getObjectId() : 0);
- packet.writeD(_player.getObjectId());
- packet.writeS(_player.getName());
- packet.writeD(_player.getRace().ordinal());
- packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
+ ServerPackets.USER_INFO.writeId(this);
+ writeInt(_player.getX());
+ writeInt(_player.getY());
+ writeInt(_player.getZ());
+ writeInt(_player.getBoat() != null ? _player.getBoat().getObjectId() : 0);
+ writeInt(_player.getObjectId());
+ writeString(_player.getName());
+ writeInt(_player.getRace().ordinal());
+ writeInt(_player.getAppearance().isFemale());
if (_player.getClassIndex() == 0)
{
- packet.writeD(_player.getClassId().getId());
+ writeInt(_player.getClassId().getId());
}
else
{
- packet.writeD(_player.getBaseClass());
+ writeInt(_player.getBaseClass());
}
- packet.writeD(_player.getLevel());
- packet.writeQ(_player.getExp());
- 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(_player.getSp());
- packet.writeD(_player.getCurrentLoad());
- packet.writeD(_player.getMaxLoad());
- packet.writeD(_player.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped
+ writeInt(_player.getLevel());
+ writeLong(_player.getExp());
+ 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(_player.getSp());
+ writeInt(_player.getCurrentLoad());
+ writeInt(_player.getMaxLoad());
+ writeInt(_player.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_DHAIR));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_REAR));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LEAR));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_NECK));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_RFINGER));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LFINGER));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_HEAD));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LHAND));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_GLOVES));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_CHEST));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LEGS));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_FEET));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_BACK));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_HAIR));
- packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_FACE));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_DHAIR));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_REAR));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LEAR));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_NECK));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_RFINGER));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LFINGER));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_HEAD));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LHAND));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_GLOVES));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_CHEST));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LEGS));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_FEET));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_BACK));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_HAIR));
+ writeInt(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_FACE));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_DHAIR));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_REAR));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEAR));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_NECK));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RFINGER));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LFINGER));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HEAD));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_CHEST));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEGS));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FEET));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_BACK));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HAIR));
- packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FACE));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_DHAIR));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_REAR));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEAR));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_NECK));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RFINGER));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LFINGER));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HEAD));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_CHEST));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEGS));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FEET));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_BACK));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HAIR));
+ writeInt(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FACE));
// c6 new h's
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeD(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_RHAND));
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeD(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_LRHAND));
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
- packet.writeH(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeInt(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_RHAND));
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeInt(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_LRHAND));
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
+ writeShort(0);
// end of c6 new h's
- packet.writeD(_player.getPAtk(null));
- packet.writeD(_player.getPAtkSpd());
- packet.writeD(_player.getPDef(null));
- packet.writeD(_player.getEvasionRate(null));
- packet.writeD(_player.getAccuracy());
- packet.writeD(_player.getCriticalHit(null, null));
- packet.writeD(_player.getMAtk(null, null));
- packet.writeD(_player.getMAtkSpd());
- packet.writeD(_player.getPAtkSpd());
- packet.writeD(_player.getMDef(null, null));
- packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name
- packet.writeD(_player.getKarma());
- packet.writeD(_runSpd); // base run speed
- packet.writeD(_walkSpd); // base walk speed
- packet.writeD(_runSpd); // swim run speed (calculated by getter)
- packet.writeD(_walkSpd); // swim walk speed (calculated by getter)
- packet.writeD(0);
- packet.writeD(0);
- packet.writeD(_flyRunSpd);
- packet.writeD(_flyWalkSpd);
- packet.writeF(_player.getMovementSpeedMultiplier()); // run speed multiplier
- packet.writeF(_player.getAttackSpeedMultiplier()); // attack speed multiplier
- 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.getPAtk(null));
+ writeInt(_player.getPAtkSpd());
+ writeInt(_player.getPDef(null));
+ writeInt(_player.getEvasionRate(null));
+ writeInt(_player.getAccuracy());
+ writeInt(_player.getCriticalHit(null, null));
+ writeInt(_player.getMAtk(null, null));
+ writeInt(_player.getMAtkSpd());
+ writeInt(_player.getPAtkSpd());
+ writeInt(_player.getMDef(null, null));
+ writeInt(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name
+ writeInt(_player.getKarma());
+ writeInt(_runSpd); // base run speed
+ writeInt(_walkSpd); // base walk speed
+ writeInt(_runSpd); // swim run speed (calculated by getter)
+ writeInt(_walkSpd); // swim walk speed (calculated by getter)
+ writeInt(0);
+ writeInt(0);
+ writeInt(_flyRunSpd);
+ writeInt(_flyWalkSpd);
+ writeDouble(_player.getMovementSpeedMultiplier()); // run speed multiplier
+ writeDouble(_player.getAttackSpeedMultiplier()); // attack speed multiplier
+ 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.getAppearance().isInvisible() && _player.isGM())
{
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()); // mount type
- packet.writeC(_player.getPrivateStoreType());
- packet.writeC(_player.hasDwarvenCraft() ? 1 : 0);
- packet.writeD(_player.getPkKills());
- packet.writeD(_player.getPvpKills());
+ writeInt(_relation);
+ writeByte(_player.getMountType()); // mount type
+ writeByte(_player.getPrivateStoreType());
+ 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);
+ writeByte(_player.isInPartyMatchRoom());
if (_player.getAppearance().isInvisible())
{
- packet.writeD((_player.getAbnormalEffect() | Creature.ABNORMAL_EFFECT_STEALTH));
+ writeInt((_player.getAbnormalEffect() | Creature.ABNORMAL_EFFECT_STEALTH));
}
else
{
- packet.writeD(_player.getAbnormalEffect()); // C2
+ writeInt(_player.getAbnormalEffect()); // C2
}
- packet.writeC(0);
- packet.writeD(_player.getClanPrivileges());
- packet.writeH(_player.getRecomLeft()); // c2 recommendations remaining
- packet.writeH(_player.getRecomHave()); // c2 recommendations received
- packet.writeD(0); // _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() ? 0 : _player.getEnchantEffect());
- packet.writeC(_player.getTeam()); // team circle around feet 1= Blue, 2 = red
- 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) || _player.isPVPHero()) ? 1 : 0); // 1: Hero Aura
+ writeByte(0);
+ writeInt(_player.getClanPrivileges());
+ writeShort(_player.getRecomLeft()); // c2 recommendations remaining
+ writeShort(_player.getRecomHave()); // c2 recommendations received
+ writeInt(0); // _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() ? 0 : _player.getEnchantEffect());
+ writeByte(_player.getTeam()); // team circle around feet 1= Blue, 2 = red
+ writeInt(_player.getClanCrestLargeId());
+ writeByte(_player.isNoble()); // 1: symbol on char menu ctrl+I
+ writeByte(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) || _player.isPVPHero()); // 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());
+ 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());
if (_player.isCursedWeaponEquiped())
{
- packet.writeD(CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquipedId()));
+ writeInt(CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquipedId()));
}
else
{
- packet.writeD(0);
+ writeInt(0);
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
index bea058fe0b..b437986c7e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.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 ValidateLocation implements IClientOutgoingPacket
+public class ValidateLocation extends ServerPacket
{
private final int _objectId;
private final int _x;
@@ -38,14 +37,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(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- return true;
+ ServerPackets.VALIDATE_LOCATION.writeId(this);
+ writeInt(_objectId);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
index cae2667af6..d8830aca54 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
+++ b/L2J_Mobius_C6_Interlude/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.actor.Creature;
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 int _boat = 1343225858;
private final int _x;
@@ -41,15 +40,14 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet);
- packet.writeD(_playerObj);
- packet.writeD(_boat);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- packet.writeD(_heading);
- return true;
+ ServerPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(this);
+ writeInt(_playerObj);
+ writeInt(_boat);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
+ writeInt(_heading);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
index eb458afca5..4ea307e9cb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
+++ b/L2J_Mobius_C6_Interlude/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 Boat _boat;
private final int _speed1;
@@ -51,15 +50,14 @@ public class VehicleDeparture implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet);
- packet.writeD(_boat.getObjectId());
- packet.writeD(_speed1);
- packet.writeD(_speed2);
- packet.writeD(_x);
- packet.writeD(_y);
- packet.writeD(_z);
- return true;
+ ServerPackets.VEHICLE_DEPARTURE.writeId(this);
+ writeInt(_boat.getObjectId());
+ writeInt(_speed1);
+ writeInt(_speed2);
+ writeInt(_x);
+ writeInt(_y);
+ writeInt(_z);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
index 5616438800..de71e554b5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
+++ b/L2J_Mobius_C6_Interlude/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 Boat _boat;
@@ -36,14 +35,13 @@ public class VehicleInfo implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.VEHICLE_INFO.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_INFO.writeId(this);
+ writeInt(_boat.getObjectId());
+ writeInt(_boat.getX());
+ writeInt(_boat.getY());
+ writeInt(_boat.getZ());
+ writeInt(_boat.getHeading());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
index 7c3f571e80..a23220eb92 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.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.instance.Item;
-import org.l2jmobius.gameserver.network.OutgoingPackets;
+import org.l2jmobius.gameserver.network.ServerPackets;
/**
* 0x53 WareHouseDepositList dh (h dddhh dhhh d)
* @version $Revision: 1.4.2.1.2.4 $ $Date: 2005/03/27 15:29:39 $
*/
-public class WareHouseDepositList implements IClientOutgoingPacket
+public class WareHouseDepositList extends ServerPacket
{
public static final int PRIVATE = 1;
public static final int CLAN = 2;
@@ -64,38 +63,37 @@ public class WareHouseDepositList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.WARE_HOUSE_DEPOSIT_LIST.writeId(packet);
+ ServerPackets.WARE_HOUSE_DEPOSIT_LIST.writeId(this);
/*
* 0x01-Private Warehouse 0x02-Clan Warehouse 0x03-Castle Warehouse 0x04-Warehouse
*/
- packet.writeH(_whType);
- packet.writeD(_playerAdena);
- packet.writeH(_items.size());
+ writeShort(_whType);
+ writeInt(_playerAdena);
+ writeShort(_items.size());
for (Item item : _items)
{
- packet.writeH(item.getTemplate().getType1()); // item type1 //unconfirmed, works
- packet.writeD(item.getObjectId()); // unconfirmed, works
- packet.writeD(item.getItemId()); // unconfirmed, works
- packet.writeD(item.getCount()); // unconfirmed, works
- packet.writeH(item.getTemplate().getType2()); // item type2 //unconfirmed, works
- packet.writeH(0); // ? 100
- packet.writeD(item.getTemplate().getBodyPart()); // ?
- packet.writeH(item.getEnchantLevel()); // enchant level -confirmed
- packet.writeH(0); // ? 300
- packet.writeH(0); // ? 200
- packet.writeD(item.getObjectId()); // item id - confimed
+ writeShort(item.getTemplate().getType1()); // item type1 //unconfirmed, works
+ writeInt(item.getObjectId()); // unconfirmed, works
+ writeInt(item.getItemId()); // unconfirmed, works
+ writeInt(item.getCount()); // unconfirmed, works
+ writeShort(item.getTemplate().getType2()); // item type2 //unconfirmed, works
+ writeShort(0); // ? 100
+ writeInt(item.getTemplate().getBodyPart()); // ?
+ writeShort(item.getEnchantLevel()); // enchant level -confirmed
+ writeShort(0); // ? 300
+ writeShort(0); // ? 200
+ writeInt(item.getObjectId()); // item id - confimed
if (item.isAugmented())
{
- packet.writeD(0x0000FFFF & item.getAugmentation().getAugmentationId());
- packet.writeD(item.getAugmentation().getAugmentationId() >> 16);
+ writeInt(0x0000FFFF & item.getAugmentation().getAugmentationId());
+ writeInt(item.getAugmentation().getAugmentationId() >> 16);
}
else
{
- packet.writeQ(0);
+ writeLong(0);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
index 6a15f2313d..5b78607134 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
@@ -18,17 +18,16 @@ 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;
/**
* 0x42 WarehouseWithdrawalList dh (h dddhh dhhh d)
* @version $Revision: 1.3.2.1.2.5 $ $Date: 2005/03/29 23:15:10 $
*/
-public class WareHouseWithdrawalList implements IClientOutgoingPacket
+public class WareHouseWithdrawalList extends ServerPacket
{
public static final int PRIVATE = 1;
public static final int CLAN = 2;
@@ -55,38 +54,37 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.WARE_HOUSE_WITHDRAWAL_LIST.writeId(packet);
+ ServerPackets.WARE_HOUSE_WITHDRAWAL_LIST.writeId(this);
/*
* 0x01-Private Warehouse 0x02-Clan Warehouse 0x03-Castle Warehouse 0x04-Warehouse
*/
- packet.writeH(_whType);
- packet.writeD(_playerAdena);
- packet.writeH(_items.size());
+ writeShort(_whType);
+ writeInt(_playerAdena);
+ writeShort(_items.size());
for (Item item : _items)
{
- packet.writeH(item.getTemplate().getType1()); // item type1 //unconfirmed, works
- packet.writeD(0); // unconfirmed, works
- packet.writeD(item.getItemId()); // unconfirmed, works
- packet.writeD(item.getCount()); // unconfirmed, works
- packet.writeH(item.getTemplate().getType2()); // item type2 //unconfirmed, works
- packet.writeH(0); // ?
- packet.writeD(item.getTemplate().getBodyPart()); // ?
- packet.writeH(item.getEnchantLevel()); // enchant level -confirmed
- packet.writeH(0); // ?
- packet.writeH(0); // ?
- packet.writeD(item.getObjectId()); // item id - confimed
+ writeShort(item.getTemplate().getType1()); // item type1 //unconfirmed, works
+ writeInt(0); // unconfirmed, works
+ writeInt(item.getItemId()); // unconfirmed, works
+ writeInt(item.getCount()); // unconfirmed, works
+ writeShort(item.getTemplate().getType2()); // item type2 //unconfirmed, works
+ writeShort(0); // ?
+ writeInt(item.getTemplate().getBodyPart()); // ?
+ writeShort(item.getEnchantLevel()); // enchant level -confirmed
+ writeShort(0); // ?
+ writeShort(0); // ?
+ writeInt(item.getObjectId()); // item id - confimed
if (item.isAugmented())
{
- packet.writeD(0x0000FFFF & item.getAugmentation().getAugmentationId());
- packet.writeD(item.getAugmentation().getAugmentationId() >> 16);
+ writeInt(0x0000FFFF & item.getAugmentation().getAugmentationId());
+ writeInt(item.getAugmentation().getAugmentationId() >> 16);
}
else
{
- packet.writeQ(0);
+ writeLong(0);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java
index b71db1827f..5c1bca7db0 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java
@@ -19,13 +19,12 @@ package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.StoreTradeList;
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 WearList implements IClientOutgoingPacket
+public class WearList extends ServerPacket
{
private final int _listId;
private final List- _list;
@@ -48,15 +47,15 @@ public class WearList implements IClientOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.WEAR_LIST.writeId(packet);
- packet.writeC(0xc0); // ?
- packet.writeC(0x13); // ?
- packet.writeC(0); // ?
- packet.writeC(0); // ?
- packet.writeD(_money); // current money
- packet.writeD(_listId);
+ ServerPackets.WEAR_LIST.writeId(this);
+ writeByte(0xc0); // ?
+ writeByte(0x13); // ?
+ writeByte(0); // ?
+ writeByte(0); // ?
+ writeInt(_money); // current money
+ writeInt(_listId);
int newlength = 0;
for (Item item : _list)
{
@@ -65,24 +64,23 @@ public class WearList implements IClientOutgoingPacket
newlength++;
}
}
- packet.writeH(newlength);
+ writeShort(newlength);
for (Item item : _list)
{
if ((item.getTemplate().getCrystalType() <= _expertise) && item.isEquipable())
{
- packet.writeD(item.getItemId());
- packet.writeH(item.getTemplate().getType2()); // item type2
+ writeInt(item.getItemId());
+ writeShort(item.getTemplate().getType2()); // item type2
if (item.getTemplate().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA)
{
- packet.writeH(item.getTemplate().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.getTemplate().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.writeD(Config.WEAR_PRICE);
+ writeInt(Config.WEAR_PRICE);
}
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
index 7b0a74500d..d71d334e16 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -25,8 +25,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;
public class Broadcast
{
@@ -39,9 +39,9 @@ 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)Caution : This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)Caution : This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)_knownPlayers .Caution : This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers) void toAllPlayersInZoneType(Class zoneType, IClientOutgoingPacket... packets)
+ public static void toAllPlayersInZoneType(Class zoneType, ServerPacket... packets)
{
for (ZoneType zone : ZoneData.getInstance().getAllZones(zoneType))
{
@@ -229,7 +229,7 @@ public class Broadcast
continue;
}
- for (IClientOutgoingPacket packet : packets)
+ for (ServerPacket packet : packets)
{
creature.sendPacket(packet);
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
index 4d4f6f8942..2d7f9b91ce 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java
@@ -24,6 +24,7 @@ import java.util.logging.Logger;
import org.l2jmobius.gameserver.enums.PunishmentType;
import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.GameClient;
+import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
/**
@@ -138,7 +139,7 @@ public class FloodProtectorAction
}
else
{
- _client.closeNow();
+ _client.close(LeaveWorld.STATIC_PACKET);
}
if (LOGGER.isLoggable(Level.WARNING))
@@ -191,7 +192,7 @@ public class FloodProtectorAction
{
if (!_client.isDetached())
{
- address = _client.getConnectionAddress().getHostAddress();
+ address = _client.getIp();
}
}
catch (Exception e)
@@ -199,7 +200,7 @@ public class FloodProtectorAction
// Ignore.
}
- final ConnectionState state = (ConnectionState) _client.getConnectionState();
+ final ConnectionState state = _client.getConnectionState();
switch (state)
{
case ENTERING:
@@ -233,7 +234,7 @@ public class FloodProtectorAction
}
default:
{
- throw new IllegalStateException("Missing state on switch");
+ throw new IllegalStateException("Missing state on switch.");
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/AccountingFormatter.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/AccountingFormatter.java
index b60321d100..e01de86af7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/AccountingFormatter.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/GameServerThread.java
index 29659a939b..7b8bc60b4f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -27,12 +27,12 @@ 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.GameServerPacketHandler.GameServerState;
+import org.l2jmobius.loginserver.network.ScrambledKeyPair;
import org.l2jmobius.loginserver.network.loginserverpackets.InitLS;
import org.l2jmobius.loginserver.network.loginserverpackets.KickPlayer;
import org.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail;
@@ -44,6 +44,10 @@ import org.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail;
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;
@@ -51,15 +55,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()
@@ -218,29 +216,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());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java
index b739a7b126..e31771906d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java
+++ b/L2J_Mobius_C6_Interlude/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;
@@ -40,12 +38,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
{
@@ -59,8 +57,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;
@@ -119,12 +117,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
@@ -150,19 +148,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
{
@@ -183,11 +181,11 @@ public class LoginController
if (!info.checkPassHash(hashBase64))
{
// wrong password
- recordFailedLoginAttemp(addr);
+ recordFailedLoginAttemp(clientAddr);
return null;
}
- clearFailedLoginAttemps(addr);
+ clearFailedLoginAttemps(clientAddr);
return info;
}
}
@@ -196,7 +194,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;
}
@@ -207,7 +205,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)
@@ -217,7 +215,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)
{
@@ -226,7 +224,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)
{
@@ -252,49 +250,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;
@@ -302,7 +296,7 @@ public class LoginController
return false;
}
- public Map getBannedIps()
+ public Map getBannedIps()
{
return _bannedIps;
}
@@ -312,26 +306,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)
@@ -434,7 +411,7 @@ 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
{
@@ -444,7 +421,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_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
index f51259f642..a009f2ba12 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/loginserver/enums/LoginFailReason.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/enums/LoginFailReason.java
index 880b631caf..f1e7b9e0af 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/enums/LoginFailReason.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/loginserver/network/BannedIpFilter.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/BannedIpFilter.java
deleted file mode 100644
index b7e2f1a9af..0000000000
--- a/L2J_Mobius_C6_Interlude/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
-{
- @Override
- protected boolean accept(ChannelHandlerContext ctx, InetSocketAddress remoteAddress) throws UnknownHostException
- {
- return !LoginController.getInstance().isBannedAddress(remoteAddress.getAddress());
- }
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/ClientInitializer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/ClientInitializer.java
deleted file mode 100644
index af12a738c2..0000000000
--- a/L2J_Mobius_C6_Interlude/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
-{
- 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_C6_Interlude/java/org/l2jmobius/loginserver/network/ClientNetworkManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/ClientNetworkManager.java
deleted file mode 100644
index c39f9e6c05..0000000000
--- a/L2J_Mobius_C6_Interlude/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
+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_C6_Interlude/java/org/l2jmobius/loginserver/network/IncomingPackets.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginClientPackets.java
similarity index 61%
rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/IncomingPackets.java
rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginClientPackets.java
index 3d36f0fe3f..1fdfffedd9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/IncomingPackets.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginEncryption.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginEncryption.java
new file mode 100644
index 0000000000..e9dad1d022
--- /dev/null
+++ b/L2J_Mobius_C6_Interlude/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
+{
+ 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_C6_Interlude/java/org/l2jmobius/loginserver/network/OutgoingPackets.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginServerPackets.java
similarity index 64%
rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/OutgoingPackets.java
rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginServerPackets.java
index ec70562b15..b059603ef3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/OutgoingPackets.java
+++ b/L2J_Mobius_C6_Interlude/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_C6_Interlude/java/org/l2jmobius/commons/util/crypt/ScrambledKeyPair.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/ScrambledKeyPair.java
similarity index 95%
rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/crypt/ScrambledKeyPair.java
rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/ScrambledKeyPair.java
index 44a1c08b67..3db2617611 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/crypt/ScrambledKeyPair.java
+++ b/L2J_Mobius_C6_Interlude/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
+public class AuthGameGuard implements LoginClientPacket
{
private int _sessionId;
@@ -41,18 +40,16 @@ public class AuthGameGuard implements IIncomingPacket
private int _data4;
@Override
- public boolean read(LoginClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- if (packet.getReadableBytes() >= 20)
+ if (packet.getRemainingLength() >= 20)
{
- _sessionId = packet.readD();
- _data1 = packet.readD();
- _data2 = packet.readD();
- _data3 = packet.readD();
- _data4 = packet.readD();
- return true;
+ _sessionId = packet.readInt();
+ _data1 = packet.readInt();
+ _data2 = packet.readInt();
+ _data3 = packet.readInt();
+ _data4 = packet.readInt();
}
- return false;
}
@Override
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/LoginClientPacket.java
similarity index 67%
rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java
rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/LoginClientPacket.java
index 8ab9076d66..9b832c9412 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/Disconnection.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/LoginClientPacket.java
@@ -14,25 +14,21 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see
+public class RequestAuthLogin implements LoginClientPacket
{
private static final Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName());
@@ -49,21 +47,18 @@ public class RequestAuthLogin implements IIncomingPacket
private boolean _newAuthMethod = false;
@Override
- public boolean read(LoginClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- if (packet.getReadableBytes() >= 256)
+ if (packet.getRemainingLength() >= 256)
{
_newAuthMethod = true;
- packet.readB(_raw1, 0, _raw1.length);
- packet.readB(_raw2, 0, _raw2.length);
- return true;
+ packet.readBytes(_raw1);
+ packet.readBytes(_raw2);
}
- else if (packet.getReadableBytes() >= 128)
+ else if (packet.getRemainingLength() >= 128)
{
- packet.readB(_raw1, 0, _raw1.length);
- return true;
+ packet.readBytes(_raw1);
}
- return false;
}
@Override
@@ -107,7 +102,7 @@ public class RequestAuthLogin implements IIncomingPacket
return;
}
- final InetAddress clientAddr = client.getConnectionAddress();
+ final String clientAddr = client.getIp();
final LoginController lc = LoginController.getInstance();
final AccountInfo info = lc.retriveAccountInfo(clientAddr, user, password);
if (info == null)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java
index 764e742b27..343dbfe0e7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerList.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.LoginClient;
import org.l2jmobius.loginserver.network.serverpackets.ServerList;
@@ -30,7 +29,7 @@ import org.l2jmobius.loginserver.network.serverpackets.ServerList;
* c: ?
*
*/
-public class RequestServerList implements IIncomingPacket
+public class RequestServerList implements LoginClientPacket
{
private int _skey1;
private int _skey2;
@@ -38,15 +37,13 @@ public class RequestServerList implements IIncomingPacket
private int _data3;
@Override
- public boolean read(LoginClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- if (packet.getReadableBytes() >= 8)
+ if (packet.getRemainingLength() >= 8)
{
- _skey1 = packet.readD(); // loginOk 1
- _skey2 = packet.readD(); // loginOk 2
- return true;
+ _skey1 = packet.readInt(); // loginOk 1
+ _skey2 = packet.readInt(); // loginOk 2
}
- return false;
}
@Override
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java
index eb4f53cb32..215e280856 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/clientpackets/RequestServerLogin.java
@@ -17,8 +17,7 @@
package org.l2jmobius.loginserver.network.clientpackets;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.IIncomingPacket;
-import org.l2jmobius.commons.network.PacketReader;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.LoginController;
import org.l2jmobius.loginserver.LoginServer;
import org.l2jmobius.loginserver.SessionKey;
@@ -36,23 +35,21 @@ import org.l2jmobius.loginserver.network.serverpackets.PlayOk;
* c: server ID
*
*/
-public class RequestServerLogin implements IIncomingPacket
+public class RequestServerLogin implements LoginClientPacket
{
private int _skey1;
private int _skey2;
private int _serverId;
@Override
- public boolean read(LoginClient client, PacketReader packet)
+ public void read(ReadablePacket packet)
{
- if (packet.getReadableBytes() >= 9)
+ if (packet.getRemainingLength() >= 9)
{
- _skey1 = packet.readD();
- _skey2 = packet.readD();
- _serverId = packet.readC();
- return true;
+ _skey1 = packet.readInt();
+ _skey2 = packet.readInt();
+ _serverId = packet.readByte();
}
- return false;
}
@Override
@@ -60,7 +57,7 @@ public class RequestServerLogin implements IIncomingPacket
{
final SessionKey sk = client.getSessionKey();
- // if we didnt showed the license we cant check these values
+ // If we didn't showed the license we can't check these values.
if (!Config.SHOW_LICENCE || sk.checkLoginPair(_skey1, _skey2))
{
if ((LoginServer.getInstance().getStatus() == ServerStatus.STATUS_DOWN) || ((LoginServer.getInstance().getStatus() == ServerStatus.STATUS_GM_ONLY) && (client.getAccessLevel() < 1)))
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
index 3039a3e04d..219d6040af 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
@@ -22,27 +22,25 @@ import java.util.logging.Logger;
import javax.crypto.Cipher;
-import org.l2jmobius.commons.network.BaseRecievePacket;
-import org.l2jmobius.commons.util.crypt.NewCrypt;
+import org.l2jmobius.commons.crypt.NewCrypt;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.GameServerThread;
import org.l2jmobius.loginserver.network.GameServerPacketHandler.GameServerState;
/**
* @author -Wooden-
*/
-public class BlowFishKey extends BaseRecievePacket
+public class BlowFishKey extends ReadablePacket
{
protected static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName());
- /**
- * @param decrypt
- * @param server
- */
public BlowFishKey(byte[] decrypt, GameServerThread server)
{
super(decrypt);
- final int size = readD();
- final byte[] tempKey = readB(size);
+ readByte(); // id (already processed)
+
+ final int size = readInt();
+ final byte[] tempKey = readBytes(size);
try
{
byte[] tempDecryptKey;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
index 72ed9671ff..02b195061f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
@@ -18,26 +18,24 @@ package org.l2jmobius.loginserver.network.gameserverpackets;
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.LoginController;
/**
* @author -Wooden-
*/
-public class ChangeAccessLevel extends BaseRecievePacket
+public class ChangeAccessLevel extends ReadablePacket
{
protected static final Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName());
- /**
- * @param decrypt
- * @param server
- */
public ChangeAccessLevel(byte[] decrypt, GameServerThread server)
{
super(decrypt);
- final int level = readD();
- final String account = readS();
+ readByte(); // id (already processed)
+
+ final int level = readInt();
+ final String account = readString();
LoginController.getInstance().setAccountAccessLevel(account, level);
LOGGER.info("Changed " + account + " access level to " + level);
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
index b40c0256c2..8570a1545f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.logging.Logger;
import org.l2jmobius.Config;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.GameServerTable;
import org.l2jmobius.loginserver.GameServerTable.GameServerInfo;
import org.l2jmobius.loginserver.GameServerThread;
@@ -43,7 +43,7 @@ import org.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail;
*
* @author -Wooden-
*/
-public class GameServerAuth extends BaseRecievePacket
+public class GameServerAuth extends ReadablePacket
{
protected static final Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName());
GameServerThread _server;
@@ -63,19 +63,21 @@ public class GameServerAuth extends BaseRecievePacket
public GameServerAuth(byte[] decrypt, GameServerThread server)
{
super(decrypt);
+ readByte(); // id (already processed)
+
_server = server;
- _desiredId = readC();
- _acceptAlternativeId = readC() != 0;
- _hostReserved = readC() != 0;
- _port = readH();
- _maxPlayers = readD();
- int size = readD();
- _hexId = readB(size);
- size = 2 * readD();
+ _desiredId = readByte();
+ _acceptAlternativeId = readByte() != 0;
+ _hostReserved = readByte() != 0;
+ _port = readShort();
+ _maxPlayers = readInt();
+ int size = readInt();
+ _hexId = readBytes(size);
+ size = 2 * readInt();
_hosts = new String[size];
for (int i = 0; i < size; i++)
{
- _hosts[i] = readS();
+ _hosts[i] = readString();
}
if (handleRegProcess())
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
index e00b38bb0e..7d431147ca 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
*/
package org.l2jmobius.loginserver.network.gameserverpackets;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.GameServerThread;
import org.l2jmobius.loginserver.LoginController;
import org.l2jmobius.loginserver.SessionKey;
@@ -25,20 +25,18 @@ import org.l2jmobius.loginserver.network.loginserverpackets.PlayerAuthResponse;
/**
* @author -Wooden-
*/
-public class PlayerAuthRequest extends BaseRecievePacket
+public class PlayerAuthRequest extends ReadablePacket
{
- /**
- * @param decrypt
- * @param server
- */
public PlayerAuthRequest(byte[] decrypt, GameServerThread server)
{
super(decrypt);
- final String account = readS();
- final int playKey1 = readD();
- final int playKey2 = readD();
- final int loginKey1 = readD();
- final int loginKey2 = readD();
+ readByte(); // id (already processed)
+
+ final String account = readString();
+ final int playKey1 = readInt();
+ final int playKey2 = readInt();
+ final int loginKey1 = readInt();
+ final int loginKey2 = readInt();
final SessionKey sessionKey = new SessionKey(loginKey1, loginKey2, playKey1, playKey2);
PlayerAuthResponse authResponse;
final SessionKey key = LoginController.getInstance().getKeyForAccount(account);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
index 243207f54b..c51e73fe29 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
@@ -16,25 +16,23 @@
*/
package org.l2jmobius.loginserver.network.gameserverpackets;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.GameServerThread;
/**
* @author -Wooden-
*/
-public class PlayerInGame extends BaseRecievePacket
+public class PlayerInGame extends ReadablePacket
{
- /**
- * @param decrypt
- * @param server
- */
public PlayerInGame(byte[] decrypt, GameServerThread server)
{
super(decrypt);
- final int size = readH();
+ readByte(); // id (already processed)
+
+ final int size = readShort();
for (int i = 0; i < size; i++)
{
- final String account = readS();
+ final String account = readString();
server.addAccountOnGameServer(account);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
index 259a900007..86b4a2f10d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
@@ -18,24 +18,22 @@ package org.l2jmobius.loginserver.network.gameserverpackets;
import java.util.logging.Logger;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.GameServerThread;
/**
* @author -Wooden-
*/
-public class PlayerLogout extends BaseRecievePacket
+public class PlayerLogout extends ReadablePacket
{
protected static final Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName());
- /**
- * @param decrypt
- * @param server
- */
public PlayerLogout(byte[] decrypt, GameServerThread server)
{
super(decrypt);
- final String account = readS();
+ readByte(); // id (already processed)
+
+ final String account = readString();
server.removeAccountOnGameServer(account);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
index 2a9624fa76..8aeb270e03 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
@@ -18,7 +18,7 @@ package org.l2jmobius.loginserver.network.gameserverpackets;
import java.util.logging.Logger;
-import org.l2jmobius.commons.network.BaseRecievePacket;
+import org.l2jmobius.commons.network.ReadablePacket;
import org.l2jmobius.loginserver.GameServerTable;
import org.l2jmobius.loginserver.GameServerTable.GameServerInfo;
import org.l2jmobius.loginserver.GameServerThread;
@@ -26,10 +26,11 @@ import org.l2jmobius.loginserver.GameServerThread;
/**
* @author -Wooden-
*/
-public class ServerStatus extends BaseRecievePacket
+public class ServerStatus extends ReadablePacket
{
protected static final Logger LOGGER = Logger.getLogger(ServerStatus.class.getName());
+ // Ids
public static final int SERVER_LIST_STATUS = 0x01;
public static final int SERVER_TYPE = 0x02;
public static final int SERVER_LIST_SQUARE_BRACKET = 0x03;
@@ -62,22 +63,19 @@ public class ServerStatus extends BaseRecievePacket
public static final int ON = 0x01;
public static final int OFF = 0x00;
- /**
- * @param decrypt
- * @param server
- */
public ServerStatus(byte[] decrypt, GameServerThread server)
{
super(decrypt);
+ readByte(); // id (already processed)
final GameServerInfo gsi = GameServerTable.getInstance().getRegisteredGameServerById(server.getServerId());
if (gsi != null)
{
- final int size = readD();
+ final int size = readInt();
for (int i = 0; i < size; i++)
{
- final int type = readD();
- final int value = readD();
+ final int type = readInt();
+ final int value = readInt();
switch (type)
{
case SERVER_LIST_STATUS:
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
index 91ba3df21d..2f30c72ac8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
@@ -16,27 +16,18 @@
*/
package org.l2jmobius.loginserver.network.loginserverpackets;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.GameServerTable;
/**
* @author -Wooden-
*/
-public class AuthResponse extends BaseSendablePacket
+public class AuthResponse extends WritablePacket
{
- /**
- * @param serverId
- */
public AuthResponse(int serverId)
{
- writeC(0x02);
- writeC(serverId);
- writeS(GameServerTable.getInstance().getServerNameById(serverId));
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x02);
+ writeByte(serverId);
+ writeString(GameServerTable.getInstance().getServerNameById(serverId));
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
index 9ce94522cb..f0427ef8e5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
@@ -16,13 +16,13 @@
*/
package org.l2jmobius.loginserver.network.loginserverpackets;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.LoginServer;
/**
* @author -Wooden-
*/
-public class InitLS extends BaseSendablePacket
+public class InitLS extends WritablePacket
{
// ID 0x00
// format
@@ -32,15 +32,9 @@ public class InitLS extends BaseSendablePacket
public InitLS(byte[] publickey)
{
- writeC(0x00);
- writeD(LoginServer.PROTOCOL_REV);
- writeD(publickey.length);
- writeB(publickey);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x00);
+ writeInt(LoginServer.PROTOCOL_REV);
+ writeInt(publickey.length);
+ writeBytes(publickey);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
index 815c35d038..5800afaa43 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
@@ -16,22 +16,16 @@
*/
package org.l2jmobius.loginserver.network.loginserverpackets;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author -Wooden-
*/
-public class KickPlayer extends BaseSendablePacket
+public class KickPlayer extends WritablePacket
{
public KickPlayer(String account)
{
- writeC(0x04);
- writeS(account);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x04);
+ writeString(account);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
index e0289e8eda..946f7ffbb7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
@@ -16,28 +16,13 @@
*/
package org.l2jmobius.loginserver.network.loginserverpackets;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author -Wooden-
*/
-public class LoginServerFail extends BaseSendablePacket
+public class LoginServerFail extends WritablePacket
{
- /**
- * @param reason
- */
- public LoginServerFail(int reason)
- {
- writeC(0x01);
- writeC(reason);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
- }
-
public static final int REASON_IP_BANNED = 1;
public static final int REASON_IP_RESERVED = 2;
public static final int REASON_WRONG_HEXID = 3;
@@ -46,4 +31,9 @@ public class LoginServerFail extends BaseSendablePacket
public static final int NOT_AUTHED = 6;
public static final int REASON_ALREADY_LOGGED8IN = 7;
+ public LoginServerFail(int reason)
+ {
+ writeByte(0x01);
+ writeByte(reason);
+ }
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
index 52539a3adb..9d5277acde 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -16,23 +16,17 @@
*/
package org.l2jmobius.loginserver.network.loginserverpackets;
-import org.l2jmobius.commons.network.BaseSendablePacket;
+import org.l2jmobius.commons.network.WritablePacket;
/**
* @author -Wooden-
*/
-public class PlayerAuthResponse extends BaseSendablePacket
+public class PlayerAuthResponse extends WritablePacket
{
public PlayerAuthResponse(String account, boolean response)
{
- writeC(0x03);
- writeS(account);
- writeC(response ? 1 : 0);
- }
-
- @Override
- public byte[] getContent()
- {
- return getBytes();
+ writeByte(0x03);
+ writeString(account);
+ writeByte(response ? 1 : 0);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java
index 1ab13a2183..a694d09298 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java
@@ -16,32 +16,26 @@
*/
package org.l2jmobius.loginserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.enums.AccountKickedReason;
-import org.l2jmobius.loginserver.network.OutgoingPackets;
+import org.l2jmobius.loginserver.network.LoginServerPackets;
/**
* @author KenM
*/
-public class AccountKicked implements IOutgoingPacket
+public class AccountKicked extends WritablePacket
{
private final AccountKickedReason _reason;
- /**
- * @param reason
- */
public AccountKicked(AccountKickedReason reason)
{
_reason = reason;
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.ACCOUNT_KICKED.writeId(packet);
- packet.writeD(_reason.getCode());
- return true;
+ LoginServerPackets.ACCOUNT_KICKED.writeId(this);
+ writeInt(_reason.getCode());
}
}
-
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java
index 1fe813e393..63d2125795 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java
@@ -16,14 +16,13 @@
*/
package org.l2jmobius.loginserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.loginserver.network.OutgoingPackets;
+import org.l2jmobius.commons.network.WritablePacket;
+import org.l2jmobius.loginserver.network.LoginServerPackets;
/**
* Format: d d: response
*/
-public class GGAuth implements IOutgoingPacket
+public class GGAuth extends WritablePacket
{
private final int _response;
@@ -33,14 +32,13 @@ public class GGAuth implements IOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.GG_AUTH.writeId(packet);
- packet.writeD(_response);
- packet.writeD(0x00);
- packet.writeD(0x00);
- packet.writeD(0x00);
- packet.writeD(0x00);
- return true;
+ LoginServerPackets.GG_AUTH.writeId(this);
+ writeInt(_response);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
+ writeInt(0);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/Init.java
index d725f45ca2..79dbf2d3fc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/Init.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/Init.java
@@ -16,9 +16,8 @@
*/
package org.l2jmobius.loginserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
-import org.l2jmobius.loginserver.network.OutgoingPackets;
+import org.l2jmobius.commons.network.WritablePacket;
+import org.l2jmobius.loginserver.network.LoginServerPackets;
/**
*
@@ -34,7 +33,7 @@ import org.l2jmobius.loginserver.network.OutgoingPackets;
* s: blowfish key
*
*/
-public class Init implements IOutgoingPacket
+public class Init extends WritablePacket
{
private final int _sessionId;
@@ -49,23 +48,21 @@ public class Init implements IOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.INIT.writeId(packet);
- packet.writeD(_sessionId); // session id
- packet.writeD(0x0000c621); // protocol revision
+ LoginServerPackets.INIT.writeId(this);
+ writeInt(_sessionId); // session id
+ writeInt(0x0000c621); // protocol revision
- packet.writeB(_publicKey); // RSA Public Key
+ writeBytes(_publicKey); // RSA Public Key
// unk GG related?
- packet.writeD(0x29DD954E);
- packet.writeD(0x77C39CFC);
- packet.writeD(0x97ADB620);
- packet.writeD(0x07BDE0F7);
+ writeInt(0x29DD954E);
+ writeInt(0x77C39CFC);
+ writeInt(0x97ADB620);
+ writeInt(0x07BDE0F7);
- packet.writeB(_blowfishKey); // BlowFish key
- packet.writeC(0x00); // null termination ;)
-
- return true;
+ writeBytes(_blowfishKey); // BlowFish key
+ writeByte(0); // null termination ;)
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java
index ec660f3814..275711b566 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.loginserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.enums.LoginFailReason;
-import org.l2jmobius.loginserver.network.OutgoingPackets;
+import org.l2jmobius.loginserver.network.LoginServerPackets;
/**
* Format: d d: the failure reason
*/
-public class LoginFail implements IOutgoingPacket
+public class LoginFail extends WritablePacket
{
private final LoginFailReason _reason;
@@ -34,10 +33,9 @@ public class LoginFail implements IOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.LOGIN_FAIL.writeId(packet);
- packet.writeC(_reason.getCode());
- return true;
+ LoginServerPackets.LOGIN_FAIL.writeId(this);
+ writeByte(_reason.getCode());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java
index 2637075acd..2decd648fa 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginOk.java
@@ -16,10 +16,9 @@
*/
package org.l2jmobius.loginserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.SessionKey;
-import org.l2jmobius.loginserver.network.OutgoingPackets;
+import org.l2jmobius.loginserver.network.LoginServerPackets;
/**
*
@@ -34,7 +33,7 @@ import org.l2jmobius.loginserver.network.OutgoingPackets;
* b: 16 bytes - unknown
*
*/
-public class LoginOk implements IOutgoingPacket
+public class LoginOk extends WritablePacket
{
private final int _loginOk1;
private final int _loginOk2;
@@ -46,18 +45,17 @@ public class LoginOk implements IOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.LOGIN_OK.writeId(packet);
- packet.writeD(_loginOk1);
- packet.writeD(_loginOk2);
- packet.writeD(0x00);
- packet.writeD(0x00);
- packet.writeD(0x000003ea);
- packet.writeD(0x00);
- packet.writeD(0x00);
- packet.writeD(0x00);
- packet.writeB(new byte[16]);
- return true;
+ LoginServerPackets.LOGIN_OK.writeId(this);
+ writeInt(_loginOk1);
+ writeInt(_loginOk2);
+ writeInt(0x00);
+ writeInt(0x00);
+ writeInt(0x000003ea);
+ writeInt(0x00);
+ writeInt(0x00);
+ writeInt(0x00);
+ writeBytes(new byte[16]);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java
index b205187db3..92ab60b373 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java
@@ -16,15 +16,14 @@
*/
package org.l2jmobius.loginserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.enums.PlayFailReason;
-import org.l2jmobius.loginserver.network.OutgoingPackets;
+import org.l2jmobius.loginserver.network.LoginServerPackets;
/**
* @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:11 $
*/
-public class PlayFail implements IOutgoingPacket
+public class PlayFail extends WritablePacket
{
private final PlayFailReason _reason;
@@ -34,10 +33,9 @@ public class PlayFail implements IOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLAY_FAIL.writeId(packet);
- packet.writeC(_reason.getCode());
- return true;
+ LoginServerPackets.PLAY_FAIL.writeId(this);
+ writeByte(_reason.getCode());
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java
index ca384aa477..052011b948 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/PlayOk.java
@@ -16,12 +16,11 @@
*/
package org.l2jmobius.loginserver.network.serverpackets;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.SessionKey;
-import org.l2jmobius.loginserver.network.OutgoingPackets;
+import org.l2jmobius.loginserver.network.LoginServerPackets;
-public class PlayOk implements IOutgoingPacket
+public class PlayOk extends WritablePacket
{
private final int _playOk1;
private final int _playOk2;
@@ -33,11 +32,10 @@ public class PlayOk implements IOutgoingPacket
}
@Override
- public boolean write(PacketWriter packet)
+ public void write()
{
- OutgoingPackets.PLAY_OK.writeId(packet);
- packet.writeD(_playOk1);
- packet.writeD(_playOk2);
- return true;
+ LoginServerPackets.PLAY_OK.writeId(this);
+ writeInt(_playOk1);
+ writeInt(_playOk2);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java
index 7df2bcb4a1..ec7bed6ea2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java
@@ -24,12 +24,11 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Logger;
-import org.l2jmobius.commons.network.IOutgoingPacket;
-import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.commons.network.WritablePacket;
import org.l2jmobius.loginserver.GameServerTable;
import org.l2jmobius.loginserver.GameServerTable.GameServerInfo;
import org.l2jmobius.loginserver.network.LoginClient;
-import org.l2jmobius.loginserver.network.OutgoingPackets;
+import org.l2jmobius.loginserver.network.LoginServerPackets;
import org.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
/**
@@ -60,7 +59,7 @@ import org.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
* is less than half the maximum. as Normal between half and 4/5 entry : _charsOnServers.entrySet())
{
final int servId = entry.getKey();
- packet.writeC(servId);
- packet.writeC(entry.getValue());
+ writeByte(servId);
+ writeByte(entry.getValue());
if ((_charsToDelete == null) || !_charsToDelete.containsKey(servId))
{
- packet.writeC(0x00);
+ writeByte(0x00);
}
else
{
- packet.writeC(_charsToDelete.get(servId).length);
+ writeByte(_charsToDelete.get(servId).length);
for (long deleteTime : _charsToDelete.get(servId))
{
- packet.writeD((int) ((deleteTime - System.currentTimeMillis()) / 1000));
+ writeInt((int) ((deleteTime - System.currentTimeMillis()) / 1000));
}
}
}
}
else
{
- packet.writeC(0x00);
+ writeByte(0x00);
}
- return true;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java
deleted file mode 100644
index d51dfb3a78..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java
+++ /dev/null
@@ -1,1235 +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 - announces in game.");
- _print.println("msg - Sends a whisper to char with .");
- _print.println("gmchat - Sends a message to all GMs with .");
- _print.println("gmlist - lists all gms online.");
- _print.println("kick - kick player from server.");
- _print.println("shutdown - shuts down server in seconds.");
- _print.println("restart - restarts down server in seconds.");
- _print.println("abort - aborts shutdown/restart.");
- _print.println("give ");
- _print.println("enchant (itemType: 1 - Helmet, 2 - Chest, 3 - Gloves, 4 - Feet, 5 - Legs, 6 - Right Hand, 7 - Left Hand, 8 - Left Ear, 9 - Right Ear , 10 - Left Finger, 11 - Right Finger, 12- Necklace, 13 - Underwear, 14 - Back, 15 - Belt, 0 - No Enchant)");
- _print.println("debug - executes the debug command (see 'help debug').");
- _print.println("reload - reload data");
- _print.println("jail [time]");
- _print.println("unjail ");
- _print.println("quit - closes telnet session.");
- }
- else if (usrCommand.equals("help debug"))
- {
- _print.println("The following is a list of all available debug commands: ");
- _print.println("full - Dumps complete debug information to an file (recommended)");
- _print.println("decay - prints info about the DecayManager");
- _print.println("PacketTP - prints info about the General Packet ThreadPool");
- _print.println("IOPacketTP - prints info about the I/O Packet ThreadPool");
- _print.println("GeneralTP - prints info about the General ThreadPool");
- }
- else if (usrCommand.equals("status"))
- {
- _print.print(getServerStatus());
- _print.flush();
- }
- else if (usrCommand.equals("forcegc"))
- {
- System.gc();
- final StringBuilder sb = new StringBuilder();
- sb.append("RAM Used: " + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1048576)); // 1024 * 1024 = 1048576
- _print.println(sb.toString());
- }
- else if (usrCommand.equals("performance"))
- {
- for (String line : ThreadPool.getStats())
- {
- _print.println(line);
- }
- _print.flush();
- }
- else if (usrCommand.equals("purge"))
- {
- ThreadPool.purge();
- _print.println("STATUS OF THREAD POOLS AFTER PURGE COMMAND:");
- _print.println("");
- for (String line : ThreadPool.getStats())
- {
- _print.println(line);
- }
- _print.flush();
- }
- else if (usrCommand.startsWith("memusage"))
- {
- final double max = Runtime.getRuntime().maxMemory() / 1024; // maxMemory is the upper
- // limit the jvm can use
- final double allocated = Runtime.getRuntime().totalMemory() / 1024; // totalMemory the
- // size of the
- // current
- // allocation pool
- final double nonAllocated = max - allocated; // non allocated memory till jvm limit
- final double cached = Runtime.getRuntime().freeMemory() / 1024; // freeMemory the
- // unused memory in
- // the allocation pool
- final double used = allocated - cached; // really used memory
- final double useable = max - used; // allocated, but non-used and non-allocated memory
- final DecimalFormat df = new DecimalFormat(" (0.0000'%')");
- final DecimalFormat df2 = new DecimalFormat(" # 'KB'");
- _print.println("+----"); // ...
- _print.println("| Allowed Memory:" + df2.format(max));
- _print.println("| |= Allocated Memory:" + df2.format(allocated) + df.format((allocated / max) * 100));
- _print.println("| |= Non-Allocated Memory:" + df2.format(nonAllocated) + df.format((nonAllocated / max) * 100));
- _print.println("| Allocated Memory:" + df2.format(allocated));
- _print.println("| |= Used Memory:" + df2.format(used) + df.format((used / max) * 100));
- _print.println("| |= Unused (cached) Memory:" + df2.format(cached) + df.format((cached / max) * 100));
- _print.println("| Useable Memory:" + df2.format(useable) + df.format((useable / max) * 100)); // ...
- _print.println("+----");
- }
- else if (usrCommand.startsWith("announce"))
- {
- try
- {
- usrCommand = usrCommand.substring(9);
- AnnouncementsTable.getInstance().announceToAll(usrCommand);
- _print.println("Announcement Sent!");
- }
- catch (StringIndexOutOfBoundsException e)
- {
- _print.println("Please Enter Some Text To Announce!");
- }
- }
- else if (usrCommand.startsWith("msg"))
- {
- try
- {
- final String val = usrCommand.substring(4);
- final StringTokenizer st = new StringTokenizer(val);
- final String name = st.nextToken();
- final String message = val.substring(name.length() + 1);
- final Player reciever = World.getInstance().getPlayer(name);
- final CreatureSay cs = new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", message);
- if (reciever != null)
- {
- reciever.sendPacket(cs);
- _print.println("Telnet Priv->" + name + ": " + message);
- _print.println("Message Sent!");
- }
- else
- {
- _print.println("Unable To Find Username: " + name);
- }
- }
- catch (StringIndexOutOfBoundsException e)
- {
- _print.println("Please Enter Some Text!");
- }
- }
- else if (usrCommand.startsWith("gmchat"))
- {
- try
- {
- usrCommand = usrCommand.substring(7);
- final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast from " + _cSocket.getInetAddress().getHostAddress(), usrCommand);
- AdminData.broadcastToGMs(cs);
- _print.println("Your Message Has Been Sent To " + getOnlineGMs() + " GM(s).");
- }
- catch (StringIndexOutOfBoundsException e)
- {
- _print.println("Please Enter Some Text To Announce!");
- }
- }
- else if (usrCommand.equals("gmlist"))
- {
- int igm = 0;
- String gmList = "";
- for (String player : AdminData.getInstance().getAllGmNames(true))
- {
- gmList = gmList + ", " + player;
- igm++;
- }
- _print.println("There are currently " + igm + " GM(s) online...");
- if (!gmList.isEmpty())
- {
- _print.println(gmList);
- }
- }
- else if (usrCommand.startsWith("kick"))
- {
- try
- {
- usrCommand = usrCommand.substring(5);
- final Player player = World.getInstance().getPlayer(usrCommand);
- if (player != null)
- {
- player.sendMessage("You are kicked by gm");
- player.logout();
- _print.println("Player kicked");
- }
- }
- catch (StringIndexOutOfBoundsException e)
- {
- _print.println("Please enter player name to kick");
- }
- }
- else if (usrCommand.startsWith("shutdown"))
- {
- try
- {
- final int val = Integer.parseInt(usrCommand.substring(9));
- Shutdown.getInstance().startShutdown(null, val, false);
- _print.println("Server Will Shutdown In " + val + " Seconds!");
- _print.println("Type \"abort\" To Abort Shutdown!");
- }
- catch (StringIndexOutOfBoundsException e)
- {
- _print.println("Please Enter * amount of seconds to shutdown!");
- }
- catch (Exception e)
- {
- _print.println("Numbers Only!");
- }
- }
- else if (usrCommand.startsWith("restart"))
- {
- try
- {
- final int val = Integer.parseInt(usrCommand.substring(8));
- Shutdown.getInstance().startShutdown(null, val, true);
- _print.println("Server Will Restart In " + val + " Seconds!");
- _print.println("Type \"abort\" To Abort Restart!");
- }
- catch (StringIndexOutOfBoundsException e)
- {
- _print.println("Please Enter * amount of seconds to restart!");
- }
- catch (Exception e)
- {
- _print.println("Numbers Only!");
- }
- }
- else if (usrCommand.startsWith("abort"))
- {
- Shutdown.getInstance().abort(null);
- _print.println("OK! - Shutdown/Restart Aborted.");
- }
- else if (usrCommand.equals("quit"))
- {
- /* Do Nothing :p - Just here to save us from the "Command Not Understood" Text */
- }
- else if (usrCommand.startsWith("give"))
- {
- final StringTokenizer st = new StringTokenizer(usrCommand.substring(5));
-
- try
- {
- final Player player = World.getInstance().getPlayer(st.nextToken());
- final int itemId = Integer.parseInt(st.nextToken());
- final int amount = Integer.parseInt(st.nextToken());
- if (player != null)
- {
- final Item item = player.getInventory().addItem("Status-Give", itemId, amount, null, null);
- final InventoryUpdate iu = new InventoryUpdate();
- iu.addItem(item);
- player.sendPacket(iu);
- final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
- sm.addItemName(itemId);
- sm.addNumber(amount);
- player.sendPacket(sm);
- _print.println("ok");
- GMAudit.auditGMAction("Telnet Admin", "Give Item", player.getName(), "item: " + itemId + " amount: " + amount);
- }
- else
- {
- _print.println("Player not found");
- }
- }
- catch (Exception e)
- {
- }
- }
- else if (usrCommand.startsWith("enchant"))
- {
- final StringTokenizer st = new StringTokenizer(usrCommand.substring(8), " ");
- int enchant = 0;
- int itemType = 0;
-
- try
- {
- final Player player = World.getInstance().getPlayer(st.nextToken());
- itemType = Integer.parseInt(st.nextToken());
- enchant = Integer.parseInt(st.nextToken());
-
- switch (itemType)
- {
- case 1:
- {
- itemType = Inventory.PAPERDOLL_HEAD;
- break;
- }
- case 2:
- {
- itemType = Inventory.PAPERDOLL_CHEST;
- break;
- }
- case 3:
- {
- itemType = Inventory.PAPERDOLL_GLOVES;
- break;
- }
- case 4:
- {
- itemType = Inventory.PAPERDOLL_FEET;
- break;
- }
- case 5:
- {
- itemType = Inventory.PAPERDOLL_LEGS;
- break;
- }
- case 6:
- {
- itemType = Inventory.PAPERDOLL_RHAND;
- break;
- }
- case 7:
- {
- itemType = Inventory.PAPERDOLL_LHAND;
- break;
- }
- case 8:
- {
- itemType = Inventory.PAPERDOLL_LEAR;
- break;
- }
- case 9:
- {
- itemType = Inventory.PAPERDOLL_REAR;
- break;
- }
- case 10:
- {
- itemType = Inventory.PAPERDOLL_LFINGER;
- break;
- }
- case 11:
- {
- itemType = Inventory.PAPERDOLL_RFINGER;
- break;
- }
- case 12:
- {
- itemType = Inventory.PAPERDOLL_NECK;
- break;
- }
- case 13:
- {
- itemType = Inventory.PAPERDOLL_UNDER;
- break;
- }
- /*
- * case 14: itemType = Inventory.PAPERDOLL_CLOAK; break; case 15: itemType = Inventory.PAPERDOLL_BELT; break;
- */
- default:
- {
- itemType = 0;
- }
- }
-
- if (enchant > 65535)
- {
- enchant = 65535;
- }
- else if (enchant < 0)
- {
- enchant = 0;
- }
-
- boolean success = false;
- if ((player != null) && (itemType > 0))
- {
- success = setEnchant(player, enchant, itemType);
- if (success)
- {
- _print.println("Item enchanted successfully.");
- }
- }
- else if (!success)
- {
- _print.println("Item failed to enchant.");
- }
- }
- catch (Exception e)
- {
- }
- }
- else if (usrCommand.startsWith("jail"))
- {
- final StringTokenizer st = new StringTokenizer(usrCommand.substring(5));
- try
- {
- final String playerName = st.nextToken();
- final Player playerObj = World.getInstance().getPlayer(playerName);
- int delay = 0;
- try
- {
- delay = Integer.parseInt(st.nextToken());
- }
- catch (NumberFormatException | NoSuchElementException nfe)
- {
- }
- // Player playerObj = World.getInstance().getPlayer(player);
- if (playerObj != null)
- {
- playerObj.setPunishLevel(PunishmentType.JAIL, delay);
- _print.println("Character " + playerObj.getName() + " jailed for " + (delay > 0 ? delay + " minutes." : "ever!"));
- }
- else
- {
- jailOfflinePlayer(playerName, delay);
- }
- }
- catch (NoSuchElementException nsee)
- {
- _print.println("Specify a character name.");
- }
- catch (Exception e)
- {
- }
- }
- else if (usrCommand.startsWith("unjail"))
- {
- final StringTokenizer st = new StringTokenizer(usrCommand.substring(7));
- try
- {
- final String playerName = st.nextToken();
- final Player playerObj = World.getInstance().getPlayer(playerName);
- if (playerObj != null)
- {
- playerObj.setPunishLevel(PunishmentType.NONE, 0);
- _print.println("Character " + playerObj.getName() + " removed from jail");
- }
- else
- {
- unjailOfflinePlayer(playerName);
- }
- }
- catch (NoSuchElementException nsee)
- {
- _print.println("Specify a character name.");
- }
- catch (Exception e)
- {
- }
- }
- else if (usrCommand.startsWith("debug") && (usrCommand.length() > 6))
- {
- final StringTokenizer st = new StringTokenizer(usrCommand.substring(6));
- final FileOutputStream fos = null;
- final OutputStreamWriter out = null;
- try
- {
- final String dbg = st.nextToken();
- if (dbg.equals("decay"))
- {
- _print.print(DecayTaskManager.getInstance().toString());
- }
- else if (dbg.equals("ai"))
- {
- /*
- * _print.println("AITaskManagerStats"); for(String line : AITaskManager.getInstance().getStats()) { _print.println(line); }
- */
- }
- else if (dbg.equals("aiflush"))
- {
- // AITaskManager.getInstance().flush();
- }
- else if (dbg.equals("full"))
- {
- debugAll();
- }
- }
- catch (Exception e)
- {
- LOGGER.warning(e.toString());
- }
- finally
- {
- if (out != null)
- {
- try
- {
- out.close();
- }
- catch (Exception e)
- {
- LOGGER.warning(e.toString());
- }
- }
-
- if (fos != null)
- {
- try
- {
- fos.close();
- }
- catch (Exception e)
- {
- LOGGER.warning(e.toString());
- }
- }
- }
- }
- else if (usrCommand.startsWith("reload"))
- {
- final StringTokenizer st = new StringTokenizer(usrCommand.substring(7));
- try
- {
- final String type = st.nextToken();
- if (type.equals("multisell"))
- {
- _print.print("Reloading multisell... ");
- MultisellData.getInstance().reload();
- _print.println("done");
- }
- else if (type.equals("skill"))
- {
- _print.print("Reloading skills... ");
- SkillTable.getInstance().reload();
- _print.println("done");
- }
- else if (type.equals("npc"))
- {
- _print.print("Reloading npc templates... ");
- NpcTable.getInstance().reloadAllNpc();
-
- if (!Config.ALT_DEV_NO_QUESTS)
- {
- QuestManager.getInstance().reloadAllQuests();
- }
-
- _print.println("done");
- }
- else if (type.equals("html"))
- {
- _print.print("Reloading html cache... ");
- HtmCache.getInstance().reload();
- _print.println("done");
- }
- else if (type.equals("item"))
- {
- _print.print("Reloading item templates... ");
- ItemTable.getInstance().reload();
- _print.println("done");
- }
- else if (type.equals("zone"))
- {
- _print.print("Reloading zones... ");
- ZoneData.getInstance().reload();
- _print.println("done");
- }
- else if (type.equals("teleports"))
- {
- _print.print("Reloading telport location table... ");
- TeleportLocationTable.getInstance().load();
- _print.println("done");
- }
- else if (type.equals("spawns"))
- {
- _print.print("Reloading spawns... ");
- RaidBossSpawnManager.getInstance().cleanUp();
- DayNightSpawnManager.getInstance().cleanUp();
- World.getInstance().deleteVisibleNpcSpawns();
- NpcTable.getInstance().reloadAllNpc();
- SpawnTable.getInstance().reloadAll();
- RaidBossSpawnManager.getInstance().load();
- _print.println("done\n");
- }
- }
- catch (Exception e)
- {
- }
- }
- else if (usrCommand.startsWith("gamestat"))
- {
- final StringTokenizer st = new StringTokenizer(usrCommand.substring(9));
- try
- {
- final String type = st.nextToken();
-
- // name;type;x;y;itemId:enchant:price...
- if (type.equals("privatestore"))
- {
- final Collection pls = World.getInstance().getAllPlayers();
- // synchronized (World.getInstance().getAllPlayers())
- {
- for (Player player : pls)
- {
- if (player.getPrivateStoreType() == 0)
- {
- continue;
- }
-
- TradeList list = null;
- String content = "";
- if (player.getPrivateStoreType() == 1) // sell
- {
- list = player.getSellList();
- for (TradeList.TradeItem item : list.getItems())
- {
- content += item.getItem().getItemId() + ":" + item.getEnchant() + ":" + item.getPrice() + ":";
- }
- content = player.getName() + ";sell;" + player.getX() + ";" + player.getY() + ";" + content;
- _print.println(content);
- }
- else if (player.getPrivateStoreType() == 3) // buy
- {
- list = player.getBuyList();
- for (TradeList.TradeItem item : list.getItems())
- {
- content += item.getItem().getItemId() + ":" + item.getEnchant() + ":" + item.getPrice() + ":";
- }
- content = player.getName() + ";buy;" + player.getX() + ";" + player.getY() + ";" + content;
- _print.println(content);
- }
- }
- }
- }
- }
- catch (Exception e)
- {
- }
- }
- else if (usrCommand.length() == 0)
- { /* Do Nothing Again - Same reason as the quit part */
- }
- _print.print("");
- _print.flush();
- }
- if (!_cSocket.isClosed())
- {
- _print.println("Bye Bye!");
- _print.flush();
- _cSocket.close();
- }
- telnetOutput(1, "Connection from " + _cSocket.getInetAddress().getHostAddress() + " was closed by client.");
- }
- catch (IOException e)
- {
- LOGGER.warning(e.toString());
- }
- }
-
- private boolean setEnchant(Player player, int ench, int armorType)
- {
- // now we need to find the equipped weapon of the targeted character...
- int curEnchant = 0; // display purposes only
- Item itemInstance = null;
-
- // only attempt to enchant if there is a weapon equipped
- Item parmorInstance = player.getInventory().getPaperdollItem(armorType);
- if ((parmorInstance != null) && (parmorInstance.getLocationSlot() == armorType))
- {
- itemInstance = parmorInstance;
- }
- else
- {
- // for bows/crossbows and double handed weapons
- parmorInstance = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
- if ((parmorInstance != null) && (parmorInstance.getLocationSlot() == Inventory.PAPERDOLL_RHAND))
- {
- itemInstance = parmorInstance;
- }
- }
-
- if (itemInstance != null)
- {
- curEnchant = itemInstance.getEnchantLevel();
-
- // set enchant value
- player.getInventory().unEquipItemInSlot(armorType);
- itemInstance.setEnchantLevel(ench);
- player.getInventory().equipItem(itemInstance);
-
- // send packets
- final InventoryUpdate iu = new InventoryUpdate();
- iu.addModifiedItem(itemInstance);
- player.sendPacket(iu);
- player.broadcastUserInfo();
-
- // informations
- player.sendMessage("Changed enchantment of " + player.getName() + "'s " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
- player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
-
- // LOGGER
- GMAudit.auditGMAction("TelnetAdministrator", "enchant", player.getName(), itemInstance.getTemplate().getName() + "(" + itemInstance.getObjectId() + ") from " + curEnchant + " to " + ench);
- return true;
- }
- return false;
- }
-
- private void jailOfflinePlayer(String name, int delay)
- {
- try (Connection con = DatabaseFactory.getConnection())
- {
- final PreparedStatement statement = con.prepareStatement("UPDATE characters SET x=?, y=?, z=?, punish_level=?, punish_timer=? WHERE char_name=?");
- statement.setInt(1, -114356);
- statement.setInt(2, -249645);
- statement.setInt(3, -2984);
- statement.setInt(4, PunishmentType.JAIL.value());
- statement.setLong(5, delay * 60000);
- statement.setString(6, name);
- statement.execute();
- final int count = statement.getUpdateCount();
- statement.close();
-
- if (count == 0)
- {
- _print.println("Character not found!");
- }
- else
- {
- _print.println("Character " + name + " jailed for " + (delay > 0 ? delay + " minutes." : "ever!"));
- }
- }
- catch (SQLException se)
- {
- _print.println("SQLException while jailing player");
- }
- }
-
- private void unjailOfflinePlayer(String name)
- {
- try (Connection con = DatabaseFactory.getConnection())
- {
- final PreparedStatement statement = con.prepareStatement("UPDATE characters SET x=?, y=?, z=?, punish_level=?, punish_timer=? WHERE char_name=?");
- statement.setInt(1, 17836);
- statement.setInt(2, 170178);
- statement.setInt(3, -3507);
- statement.setInt(4, 0);
- statement.setLong(5, 0);
- statement.setString(6, name);
- statement.execute();
- final int count = statement.getUpdateCount();
- statement.close();
-
- if (count == 0)
- {
- _print.println("Character not found!");
- }
- else
- {
- _print.println("Character " + name + " set free.");
- }
- }
- catch (SQLException se)
- {
- _print.println("SQLException while jailing player");
- }
- }
-
- private int getOnlineGMs()
- {
- return AdminData.getInstance().getAllGms(true).size();
- }
-
- private String getUptime(int time)
- {
- int uptime = (int) System.currentTimeMillis() - time;
- uptime = uptime / 1000;
- final int h = uptime / 3600;
- final int m = (uptime - (h * 3600)) / 60;
- final int s = ((uptime - (h * 3600)) - (m * 60));
- return h + "hrs " + m + "mins " + s + "secs";
- }
-
- private String gameTime()
- {
- final int t = GameTimeTaskManager.getInstance().getGameTime();
- final int h = t / 60;
- final int m = t % 60;
- final SimpleDateFormat format = new SimpleDateFormat("H:mm");
- final Calendar cal = Calendar.getInstance();
- cal.set(Calendar.HOUR_OF_DAY, h);
- cal.set(Calendar.MINUTE, m);
- return format.format(cal.getTime());
- }
-
- public String getServerStatus()
- {
- int playerCount = 0;
- int objectCount = 0;
- final int max = LoginServerThread.getInstance().getMaxPlayer();
- playerCount = World.getAllPlayersCount();
- objectCount = World.getInstance().getAllVisibleObjectsCount();
- int itemCount = 0;
- int itemVoidCount = 0;
- int monsterCount = 0;
- int minionCount = 0;
- final int minionsGroupCount = 0;
- int npcCount = 0;
- int charCount = 0;
- int pcCount = 0;
- int detachedCount = 0;
- int doorCount = 0;
- int summonCount = 0;
- int aiCount = 0;
- for (WorldObject obj : World.getInstance().getAllVisibleObjects())
- {
- if (obj == null)
- {
- continue;
- }
- if ((obj instanceof Creature) && ((Creature) obj).hasAI())
- {
- aiCount++;
- }
- if (obj instanceof Item)
- {
- if (((Item) obj).getItemLocation() == ItemLocation.VOID)
- {
- itemVoidCount++;
- }
- else
- {
- itemCount++;
- }
- }
- else if (obj instanceof Monster)
- {
- monsterCount++;
- if (((Monster) obj).hasMinions())
- {
- minionCount += ((Monster) obj).getSpawnedMinions().size(); /* .countSpawnedMinions(); */
- // minionsGroupCount += ((Monster) obj).getMinionList().lazyCountSpawnedMinionsGroups();
- }
- }
- else if (obj instanceof Npc)
- {
- npcCount++;
- }
- else if (obj instanceof Player)
- {
- pcCount++;
- if ((((Player) obj).getClient() != null) && ((Player) obj).getClient().isDetached())
- {
- detachedCount++;
- }
- }
- else if (obj instanceof Summon)
- {
- summonCount++;
- }
- else if (obj instanceof Door)
- {
- doorCount++;
- }
- else if (obj instanceof Creature)
- {
- charCount++;
- }
- }
-
- final StringBuilder sb = new StringBuilder();
- sb.append("Server Status: ");
- sb.append("\r\n ---> Player Count: " + playerCount + "/" + max);
- sb.append("\r\n ---> Offline Count: " + detachedCount + "/" + playerCount);
- sb.append("\r\n +--> Object Count: " + objectCount);
- sb.append("\r\n +--> AI Count: " + aiCount);
- sb.append("\r\n +.... Item(Void): " + itemVoidCount);
- sb.append("\r\n +.......... Item: " + itemCount);
- sb.append("\r\n +....... Monster: " + monsterCount);
- sb.append("\r\n +......... Minions: " + minionCount);
- sb.append("\r\n +.. Minions Groups: " + minionsGroupCount);
- sb.append("\r\n +........... Npc: " + npcCount);
- sb.append("\r\n +............ Player: " + pcCount);
- sb.append("\r\n +........ Summon: " + summonCount);
- sb.append("\r\n +.......... Door: " + doorCount);
- sb.append("\r\n +.......... Creature: " + charCount);
- sb.append("\r\n ---> Ingame Time: " + gameTime());
- sb.append("\r\n ---> Server Uptime: " + getUptime(_uptime));
- sb.append("\r\n ---> GM Count: " + getOnlineGMs());
- sb.append("\r\n ---> Threads: " + Thread.activeCount());
- sb.append("\r\n RAM Used: " + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1048576)); // 1024 * 1024 = 1048576
- sb.append("\r\n");
-
- return sb.toString();
- }
-
- public void debugAll()
- {
- final Calendar cal = Calendar.getInstance();
- final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
- final StringBuilder sb = new StringBuilder();
- sb.append(sdf.format(cal.getTime()));
- sb.append("\n\n");
- sb.append(getServerStatus());
- sb.append("\n\n");
- sb.append("\n## Java Platform Information ##");
- sb.append("\nJava Runtime Name: " + System.getProperty("java.runtime.name"));
- sb.append("\nJava Version: " + System.getProperty("java.version"));
- sb.append("\nJava Class Version: " + System.getProperty("java.class.version"));
- sb.append('\n');
- sb.append("\n## Virtual Machine Information ##");
- sb.append("\nVM Name: " + System.getProperty("java.vm.name"));
- sb.append("\nVM Version: " + System.getProperty("java.vm.version"));
- sb.append("\nVM Vendor: " + System.getProperty("java.vm.vendor"));
- sb.append("\nVM Info: " + System.getProperty("java.vm.info"));
- sb.append('\n');
- sb.append("\n## OS Information ##");
- sb.append("\nName: " + System.getProperty("os.name"));
- sb.append("\nArchiteture: " + System.getProperty("os.arch"));
- sb.append("\nVersion: " + System.getProperty("os.version"));
- sb.append('\n');
- sb.append("\n## Runtime Information ##");
- sb.append("\nCPU Count: " + Runtime.getRuntime().availableProcessors());
- sb.append("\nCurrent Free Heap Size: " + (Runtime.getRuntime().freeMemory() / 1024 / 1024) + " mb");
- sb.append("\nCurrent Heap Size: " + (Runtime.getRuntime().totalMemory() / 1024 / 1024) + " mb");
- sb.append("\nMaximum Heap Size: " + (Runtime.getRuntime().maxMemory() / 1024 / 1024) + " mb");
- sb.append('\n');
- sb.append("\n## Class Path Information ##\n");
- final String cp = System.getProperty("java.class.path");
- final String[] libs = cp.split(File.pathSeparator);
- for (String lib : libs)
- {
- sb.append(lib);
- sb.append('\n');
- }
-
- sb.append('\n');
-
- checkForDeadlocks(sb);
-
- sb.append("\n\n## Thread Pool Manager Statistics ##\n");
- for (String line : ThreadPool.getStats())
- {
- sb.append(line);
- sb.append('\n');
- }
-
- int i = 0;
- File f = new File("./log/Debug-" + i + ".txt");
- while (f.exists())
- {
- i++;
- f = new File("./log/Debug-" + i + ".txt");
- }
- f.getParentFile().mkdirs();
-
- FileOutputStream fos = null;
- OutputStreamWriter out = null;
- try
- {
- fos = new FileOutputStream(f);
- out = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
- out.write(sb.toString());
- out.flush();
- }
- catch (FileNotFoundException e3)
- {
- LOGGER.warning(e3.toString());
- }
- catch (IOException e)
- {
- LOGGER.warning(e.toString());
- }
- finally
- {
- if (out != null)
- {
- try
- {
- out.close();
- }
- catch (Exception e)
- {
- LOGGER.warning(e.toString());
- }
- }
-
- if (fos != null)
- {
- try
- {
- fos.close();
- }
- catch (Exception e)
- {
- LOGGER.warning(e.toString());
- }
- }
- }
-
- _print.println("Debug output saved to log/" + f.getName());
- _print.flush();
- }
-
- private void checkForDeadlocks(StringBuilder sb)
- {
- final ThreadMXBean mbean = ManagementFactory.getThreadMXBean();
- final long[] ids = findDeadlockedThreads(mbean);
- if ((ids != null) && (ids.length > 0))
- {
- final Thread[] threads = new Thread[ids.length];
- for (int i = 0; i < threads.length; i++)
- {
- threads[i] = findMatchingThread(mbean.getThreadInfo(ids[i]));
- }
- sb.append("Deadlocked Threads:\n");
- sb.append("-------------------\n");
- for (Thread thread : threads)
- {
- LOGGER.warning(thread.getName());
- for (StackTraceElement ste : thread.getStackTrace())
- {
- sb.append("\t" + ste);
- sb.append('\n');
- }
- }
- }
- }
-
- private long[] findDeadlockedThreads(ThreadMXBean mbean)
- {
- // JDK 1.5 only supports the findMonitorDeadlockedThreads()
- // method, so you need to comment out the following three lines
- if (mbean.isSynchronizerUsageSupported())
- {
- return mbean.findDeadlockedThreads();
- }
- return mbean.findMonitorDeadlockedThreads();
- }
-
- private Thread findMatchingThread(ThreadInfo inf)
- {
- for (Thread thread : Thread.getAllStackTraces().keySet())
- {
- if (thread.getId() == inf.getThreadId())
- {
- return thread;
- }
- }
- throw new IllegalStateException("Deadlocked Thread not found");
- }
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/LoginStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/LoginStatusThread.java
deleted file mode 100644
index a913f35250..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/LoginStatusThread.java
+++ /dev/null
@@ -1,279 +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 - removes from banlist.");
- _print.println("shutdown - shuts down server.");
- _print.println("restart - restarts the server.");
- _print.println("RedirectLogger - Telnet will give you some info about server in real time.");
- _print.println("quit - closes telnet session.");
- _print.println("");
- }
- else if (usrCommand.equals("status"))
- {
- // TODO enhance the output
- _print.println("Registered Server Count: " + GameServerTable.getInstance().getRegisteredGameServers().size());
- }
- else if (usrCommand.startsWith("unblock"))
- {
- try
- {
- usrCommand = usrCommand.substring(8);
- if (LoginController.getInstance().removeBanForAddress(usrCommand))
- {
- LOGGER.warning("IP removed via TELNET by host: " + _cSocket.getInetAddress().getHostAddress());
- _print.println("The IP " + usrCommand + " has been removed from the hack protection list!");
- }
- else
- {
- _print.println("IP not found in hack protection list...");
- }
- }
- catch (StringIndexOutOfBoundsException e)
- {
- _print.println("Please Enter the IP to Unblock!");
- }
- }
- else if (usrCommand.startsWith("shutdown"))
- {
- LoginServer.getInstance().shutdown(false);
- _print.println("Bye Bye!");
- _print.flush();
- _cSocket.close();
- }
- else if (usrCommand.startsWith("restart"))
- {
- LoginServer.getInstance().shutdown(true);
- _print.println("Bye Bye!");
- _print.flush();
- _cSocket.close();
- }
- else if (usrCommand.equals("RedirectLogger"))
- {
- _redirectLogger = true;
- }
- else if (usrCommand.equals("quit"))
- { /* Do Nothing :p - Just here to save us from the "Command Not Understood" Text */
- }
- else if (usrCommand.length() == 0)
- { /* Do Nothing Again - Same reason as the quit part */
- }
- else
- {
- _print.println("Invalid Command");
- }
- _print.print("");
- _print.flush();
- }
- if (!_cSocket.isClosed())
- {
- _print.println("Bye Bye!");
- _print.flush();
- _cSocket.close();
- }
- telnetOutput(1, "Connection from " + _cSocket.getInetAddress().getHostAddress() + " was closed by client.");
- }
- catch (IOException e)
- {
- LOGGER.warning(e.toString());
- }
- }
-
- public void printToTelnet(String msg)
- {
- synchronized (_print)
- {
- _print.println(msg);
- _print.flush();
- }
- }
-
- /**
- * @return Returns the redirectLogger.
- */
- public boolean isRedirectLogger()
- {
- return _redirectLogger;
- }
-}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/TelnetStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/TelnetStatusThread.java
deleted file mode 100644
index 674180ba36..0000000000
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/TelnetStatusThread.java
+++ /dev/null
@@ -1,177 +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 _loginStatus;
-
- @Override
- public void run()
- {
- setPriority(Thread.MAX_PRIORITY);
-
- while (true)
- {
- try
- {
- final Socket connection = statusServerSocket.accept();
- if (Config.SERVER_MODE == ServerMode.GAME)
- {
- final GameStatusThread gst = new GameStatusThread(connection, _uptime, _statusPw);
- if (!connection.isClosed())
- {
- ThreadPool.execute(gst);
- }
- }
- else if (Config.SERVER_MODE == ServerMode.LOGIN)
- {
- final LoginStatusThread lst = new LoginStatusThread(connection, _uptime, _statusPw);
- if (!connection.isClosed())
- {
- ThreadPool.execute(lst);
- _loginStatus.add(lst);
- }
- }
- if (isInterrupted())
- {
- try
- {
- statusServerSocket.close();
- }
- catch (IOException io)
- {
- LOGGER.warning(io.toString());
- }
- break;
- }
- }
- catch (IOException e)
- {
- if (isInterrupted())
- {
- try
- {
- statusServerSocket.close();
- }
- catch (IOException io)
- {
- LOGGER.warning(io.toString());
- }
- break;
- }
- }
- }
- }
-
- public TelnetStatusThread() throws IOException
- {
- super("Status");
- final Properties telnetSettings = new Properties();
- final InputStream is = new FileInputStream(new File(Config.TELNET_CONFIG_FILE));
- telnetSettings.load(is);
- is.close();
-
- _statusPort = Integer.parseInt(telnetSettings.getProperty("StatusPort", "12345"));
- _statusPw = telnetSettings.getProperty("StatusPW");
- if ((Config.SERVER_MODE == ServerMode.GAME) || (Config.SERVER_MODE == ServerMode.LOGIN))
- {
- if (_statusPw == null)
- {
- LOGGER.info("Server's Telnet Function Has No Password Defined!");
- LOGGER.info("A Password Has Been Automaticly Created!");
- _statusPw = rndPW(10);
- LOGGER.info("Password Has Been Set To: " + _statusPw);
- }
- LOGGER.info("Telnet StatusServer started successfully, listening on Port: " + _statusPort);
- }
-
- statusServerSocket = new ServerSocket(_statusPort);
- _uptime = (int) System.currentTimeMillis();
- _loginStatus = new ArrayList<>();
- }
-
- private String rndPW(int length)
- {
- final String lowerChar = "qwertyuiopasdfghjklzxcvbnm";
- final String upperChar = "QWERTYUIOPASDFGHJKLZXCVBNM";
- final String digits = "1234567890";
- final StringBuilder password = new StringBuilder(length);
- for (int i = 0; i < length; i++)
- {
- final int charSet = Rnd.get(3);
- switch (charSet)
- {
- case 0:
- {
- password.append(lowerChar.charAt(Rnd.get(lowerChar.length() - 1)));
- break;
- }
- case 1:
- {
- password.append(upperChar.charAt(Rnd.get(upperChar.length() - 1)));
- break;
- }
- case 2:
- {
- password.append(digits.charAt(Rnd.get(digits.length() - 1)));
- break;
- }
- }
- }
- return password.toString();
- }
-
- public void sendMessageToTelnets(String msg)
- {
- final List lsToRemove = new ArrayList<>();
- for (LoginStatusThread ls : _loginStatus)
- {
- if (ls.isInterrupted())
- {
- lsToRemove.add(ls);
- }
- else
- {
- ls.printToTelnet(msg);
- }
- }
- }
-}